diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /arch/arm/kernel/semaphore.c | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
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\ |