Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3334c39f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 71b2c86f 614d73ed

arch/arm/lib/bitops.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ 
	mov	r3, r2, lsl r3		@ create mask

	mov	r3, r2, lsl r3		@ create mask

1:	ldrexb	r2, [r1]

1:	ldrexb	r2, [r1]

	ands	r0, r2, r3		@ save old value of bit

	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

	bne	1b

	cmp	r0, #0

	cmp	r0, #0

	movne	r0, #1

	movne	r0, #1