diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 08:51:50 -0400 |
| commit | e5baa396af7560382d2cf3f0871d616b61fc284c (patch) | |
| tree | 6afc166894b8c8b3b2cf6add72a726be14ae2443 /arch/arm/kernel/semaphore.c | |
| parent | d6a4c847e43c851cc0ddf73087a730227223f989 (diff) | |
| parent | ef6bd6eb90ad72ee8ee7ba8b271f27102e9a90c1 (diff) | |
Merge from Linus' tree.
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\ |