summary refs log tree commit diff
path: root/include/asm-arm/locks.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-24 12:13:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-24 12:13:40 +0100
commit4e8fd22bd421d7aa279bcb76189505a1f96bb7bf (patch)
treef23106b362b242eec555b16b34f8ad22f035c65a /include/asm-arm/locks.h
parent2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4 (diff)
downloadlinux-4e8fd22bd421d7aa279bcb76189505a1f96bb7bf.tar.gz
[PATCH] ARM SMP: Fix ARMv6 spinlock and semaphore implementations
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/locks.h')
-rw-r--r--include/asm-arm/locks.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/locks.h b/include/asm-arm/locks.h
index c26298f3891f..9cb33fcc06c1 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"				\