---

yaml --- r: 309599 b: refs/heads/master c: bf3db85 h: refs/heads/master i: 309597: cecc5bb 309595: c0212d6 309591: 648534c 309583: 2f551a9 309567: e4aa083 v: v3
git-mirror · May 30, 2012 · 5f4b9ff · 5f4b9ff
1 parent 70edf64
commit 5f4b9ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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: