From 5f4b9ff7c551cdd735f7164342204d6ca4afc2e3 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 29 May 2012 10:11:21 +0200
Subject: [PATCH] --- yaml --- r: 309599 b: refs/heads/master c:
 bf3db85311292eeacc9a9a8f38a0a4065a43a2fc h: refs/heads/master i:   309597:
 cecc5bb60bafe50fa4b5a8e43c2e5b995e23e737   309595:
 c0212d63d79a82a51744252190f80592dba9f607   309591:
 648534cbc6b7bceb78a2f262f829da37f9d40ce4   309583:
 2f551a9a5bec2021572ac9c4b8d1a95feda4eeff   309567:
 e4aa083bf0dc23269bd0224a824b107aa345e57e v: v3

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

diff --git a/[refs] b/[refs]
index 2057c5bbb4c3..deb4d34110b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b894a409e8c0fcbd0ea30f5b013e33b9c4b28a1
+refs/heads/master: bf3db85311292eeacc9a9a8f38a0a4065a43a2fc
diff --git a/trunk/arch/s390/include/asm/cmpxchg.h b/trunk/arch/s390/include/asm/cmpxchg.h
index 13c8b2eb6983..26f2cb1aa9ff 100644
--- a/trunk/arch/s390/include/asm/cmpxchg.h
+++ b/trunk/arch/s390/include/asm/cmpxchg.h
@@ -113,9 +113,9 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old,
 			"	nr	%1,%5\n"
 			"	jnz	0b\n"
 			"1:"
-			: "=&d" (prev), "=&d" (tmp), "=Q" (*(int *) ptr)
+			: "=&d" (prev), "=&d" (tmp), "+Q" (*(int *) addr)
 			: "d" (old << shift), "d" (new << shift),
-			  "d" (~(255 << shift)), "Q" (*(int *) ptr)
+			  "d" (~(255 << shift))
 			: "memory", "cc");
 		return prev >> shift;
 	case 2:
@@ -134,9 +134,9 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old,
 			"	nr	%1,%5\n"
 			"	jnz	0b\n"
 			"1:"
-			: "=&d" (prev), "=&d" (tmp), "=Q" (*(int *) ptr)
+			: "=&d" (prev), "=&d" (tmp), "+Q" (*(int *) addr)
 			: "d" (old << shift), "d" (new << shift),
-			  "d" (~(65535 << shift)), "Q" (*(int *) ptr)
+			  "d" (~(65535 << shift))
 			: "memory", "cc");
 		return prev >> shift;
 	case 4: