From: Andi Kleen <ak@suse.de>
Date: Sun, 22 Jul 2007 09:12:40 +0000 (+0200)
Subject: i386: Use patchable lock prefix in set_64bit
X-Git-Tag: v2.6.23-rc1~24
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e05aff854c9f348629bb66c191eee87e4d002900;p=linux-2.6-omap-h63xx.git

i386: Use patchable lock prefix in set_64bit

Previously lock was unconditionally used, but shouldn't be needed on
UP systems.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-i386/cmpxchg.h b/include/asm-i386/cmpxchg.h
index 64dcdf46117..f86ede28f6d 100644
--- a/include/asm-i386/cmpxchg.h
+++ b/include/asm-i386/cmpxchg.h
@@ -34,7 +34,7 @@ static inline void __set_64bit (unsigned long long * ptr,
 		"\n1:\t"
 		"movl (%0), %%eax\n\t"
 		"movl 4(%0), %%edx\n\t"
-		"lock cmpxchg8b (%0)\n\t"
+		LOCK_PREFIX "cmpxchg8b (%0)\n\t"
 		"jnz 1b"
 		: /* no outputs */
 		:	"D"(ptr),