From dfb561a9e58710990b0e3ad1cbd525ad029b85f1 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Fri, 15 Aug 2008 12:45:09 -0400
Subject: [PATCH] --- yaml --- r: 110325 b: refs/heads/master c:
 1f49a2c2aeb22d5abc6d4ea574ff63d37ca55fbe h: refs/heads/master i:   110323:
 4b107526e59bd4df4ef7f8049fd31ea892e72a7c v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-x86/futex.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1201436b75a4..e22f2ced9038 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f88f07e0f0fd6376e081b10930d272a08fbf082f
+refs/heads/master: 1f49a2c2aeb22d5abc6d4ea574ff63d37ca55fbe
diff --git a/trunk/include/asm-x86/futex.h b/trunk/include/asm-x86/futex.h
index e7a76b37b333..d1b988ce080a 100644
--- a/trunk/include/asm-x86/futex.h
+++ b/trunk/include/asm-x86/futex.h
@@ -25,7 +25,7 @@
 	asm volatile("1:\tmovl	%2, %0\n"			\
 		     "\tmovl\t%0, %3\n"				\
 		     "\t" insn "\n"				\
-		     "2:\tlock; cmpxchgl %3, %2\n"		\
+		     "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n"	\
 		     "\tjnz\t1b\n"				\
 		     "3:\t.section .fixup,\"ax\"\n"		\
 		     "4:\tmov\t%5, %1\n"			\
@@ -64,7 +64,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
 		__futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
 		break;
 	case FUTEX_OP_ADD:
-		__futex_atomic_op1("lock; xaddl %0, %2", ret, oldval,
+		__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
 				   uaddr, oparg);
 		break;
 	case FUTEX_OP_OR:
@@ -122,7 +122,7 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
 	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
 		return -EFAULT;
 
-	asm volatile("1:\tlock; cmpxchgl %3, %1\n"
+	asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
 		     "2:\t.section .fixup, \"ax\"\n"
 		     "3:\tmov     %2, %0\n"
 		     "\tjmp     2b\n"