From 4a23063e29d807dc72da9b42b1caf718926ee001 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 2 Apr 2012 16:15:33 -0700
Subject: [PATCH] --- yaml --- r: 299072 b: refs/heads/master c:
 2ca052a3710fac208eee690faefdeb8bbd4586a1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6a8170898e08..8be0715d29f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46ed99d1b7c92920ce9e313152522847647aae4f
+refs/heads/master: 2ca052a3710fac208eee690faefdeb8bbd4586a1
diff --git a/trunk/arch/x86/include/asm/cmpxchg.h b/trunk/arch/x86/include/asm/cmpxchg.h
index b3b733262909..bc18d0ed459a 100644
--- a/trunk/arch/x86/include/asm/cmpxchg.h
+++ b/trunk/arch/x86/include/asm/cmpxchg.h
@@ -43,7 +43,7 @@ extern void __add_wrong_size(void)
 		switch (sizeof(*(ptr))) {				\
 		case __X86_CASE_B:					\
 			asm volatile (lock #op "b %b0, %1\n"		\
-				      : "+r" (__ret), "+m" (*(ptr))	\
+				      : "+q" (__ret), "+m" (*(ptr))	\
 				      : : "memory", "cc");		\
 			break;						\
 		case __X86_CASE_W:					\