commit 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun Jul 24 12:13:40 2005 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Jul 24 12:13:40 2005 +0100
tree f23106b362b242eec555b16b34f8ad22f035c65a
parent 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4

[PATCH] ARM SMP: Fix ARMv6 spinlock and semaphore implementations

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

include/asm-arm/locks.h

diff --git a/include/asm-arm/locks.h b/include/asm-arm/locks.h
index c26298f..9cb33fc 100644
--- a/include/asm-arm/locks.h
+++ b/include/asm-arm/locks.h
@@ -61,7 +61,7 @@
 "	strex	ip, lr, [%0]\n"			\
 "	teq	ip, #0\n"			\
 "	bne	1b\n"				\
-"	teq	lr, #0\n"			\
+"	cmp	lr, #0\n"			\
 "	movle	ip, %0\n"			\
 "	blle	" #wake				\
 	:					\
@@ -100,7 +100,7 @@
 	__asm__ __volatile__(			\
 	"@ up_op_read\n"			\
 "1:	ldrex	lr, [%0]\n"			\
-"	add	lr, lr, %1\n"			\
+"	adds	lr, lr, %1\n"			\
 "	strex	ip, lr, [%0]\n"			\
 "	teq	ip, #0\n"			\
 "	bne	1b\n"				\