summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:36:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:36:08 -0700
commit3334c39f1815d2911238c43f40840c3c7b378165 (patch)
tree19555dab8c2811141b4070f30c0723d17965a162
parent71b2c86f5fd22b27feaa6c19c2c6662480ecd7d5 (diff)
parent614d73edae68836f7659ee8efec90878e6215fb1 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
-rw-r--r--arch/arm/lib/bitops.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 6976e60e47cb..5382a3023602 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -19,9 +19,9 @@
mov r3, r2, lsl r3 @ create mask
1: ldrexb r2, [r1]
ands r0, r2, r3 @ save old value of bit
- \instr ip, r2, r3 @ toggle bit
- strexb r2, ip, [r1]
- cmp r2, #0
+ \instr r2, r2, r3 @ toggle bit
+ strexb ip, r2, [r1]
+ cmp ip, #0
bne 1b
cmp r0, #0
movne r0, #1