Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

3334c39f · Linus Torvalds · 71b2c86f · 614d73ed · 3334c39f
Commit 3334c39f authored Jul 27, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arch/arm/lib/bitops.h arch/arm/lib/bitops.h +3 -3

No files found.
--- 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
+	\instr	r2, r2, r3			@ toggle bit
-	strexb	r2, ip, [r1]
+	strexb	ip, r2, [r1]
-	cmp	r2, #0
+	cmp	ip, #0
 	bne	1b
 	cmp	r0, #0
 	movne	r0, #1