From a172c88fdd955e6999e69695389741d3c19bb78d Mon Sep 17 00:00:00 2001
From: Stephan Schreiber <info@fs-driver.org>
Date: Tue, 19 Mar 2013 15:22:27 -0700
Subject: [PATCH] --- yaml --- r: 362839 b: refs/heads/master c:
 136f39ddc53db3bcee2befbe323a56d4fbf06da8 h: refs/heads/master i:   362837:
 da96c7e0243acbaeb8ec761516aaa4addb8e75d0   362835:
 f751f3ae1b94fd6c253c5c5ddb3a59deab9a5d27   362831:
 ab4adb86a2f9fcfe021f19ad56925c75c9414d13 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/ia64/include/asm/futex.h | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9a9b903d3c0e..0b8123c4cf50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c13e0d1e8f4eeb3537d9a0b6b70e464c5736854
+refs/heads/master: 136f39ddc53db3bcee2befbe323a56d4fbf06da8
diff --git a/trunk/arch/ia64/include/asm/futex.h b/trunk/arch/ia64/include/asm/futex.h
index d2bf1fd5e44f..76acbcd5c060 100644
--- a/trunk/arch/ia64/include/asm/futex.h
+++ b/trunk/arch/ia64/include/asm/futex.h
@@ -106,16 +106,15 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 		return -EFAULT;
 
 	{
-		register unsigned long r8 __asm ("r8");
+		register unsigned long r8 __asm ("r8") = 0;
 		unsigned long prev;
 		__asm__ __volatile__(
 			"	mf;;					\n"
-			"	mov %0=r0				\n"
 			"	mov ar.ccv=%4;;				\n"
 			"[1:]	cmpxchg4.acq %1=[%2],%3,ar.ccv		\n"
 			"	.xdata4 \"__ex_table\", 1b-., 2f-.	\n"
 			"[2:]"
-			: "=r" (r8), "=r" (prev)
+			: "+r" (r8), "=&r" (prev)
 			: "r" (uaddr), "r" (newval),
 			  "rO" ((long) (unsigned) oldval)
 			: "memory");