diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-18 18:31:20 -0400 |
| commit | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (patch) | |
| tree | 7513cdadc661cfe0bd1625145a4876e54df191ca /arch/arm/kernel/semaphore.c | |
| parent | 628f87f3d585bd0c2b0e39df039585d7a5831cc9 (diff) | |
| parent | 118ec0b3e02e7d22cf27b9f5a2836fa6f395b61a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/semaphore.c')
| -rw-r--r-- | arch/arm/kernel/semaphore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/semaphore.c b/arch/arm/kernel/semaphore.c index ac423e3e224b..4c31f2923055 100644 --- a/arch/arm/kernel/semaphore.c +++ b/arch/arm/kernel/semaphore.c | |||
| @@ -178,7 +178,7 @@ int __down_trylock(struct semaphore * sem) | |||
| 178 | * registers (r0 to r3 and lr), but not ip, as we use it as a return | 178 | * registers (r0 to r3 and lr), but not ip, as we use it as a return |
| 179 | * value in some cases.. | 179 | * value in some cases.. |
| 180 | */ | 180 | */ |
| 181 | asm(" .section .sched.text,\"ax\" \n\ | 181 | asm(" .section .sched.text,\"ax\",%progbits \n\ |
| 182 | .align 5 \n\ | 182 | .align 5 \n\ |
| 183 | .globl __down_failed \n\ | 183 | .globl __down_failed \n\ |
| 184 | __down_failed: \n\ | 184 | __down_failed: \n\ |