diff --git a/[refs] b/[refs]
index 547525e9e810..1ce2b2daf016 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a08786568a7e334d8a07a7bb8f4fafa3f7afb89c
+refs/heads/master: 1bff779285f89cd0b62955c20cca70ada4074236
diff --git a/trunk/arch/s390/include/asm/system.h b/trunk/arch/s390/include/asm/system.h
index 12be42baa055..1741c1556a4e 100644
--- a/trunk/arch/s390/include/asm/system.h
+++ b/trunk/arch/s390/include/asm/system.h
@@ -219,8 +219,8 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 			"	l	%0,%2\n"
 			"0:	nr	%0,%5\n"
 			"	lr	%1,%0\n"
-			"	or	%0,%2\n"
-			"	or	%1,%3\n"
+			"	or	%0,%3\n"
+			"	or	%1,%4\n"
 			"	cs	%0,%1,%2\n"
 			"	jnl	1f\n"
 			"	xr	%1,%0\n"
@@ -240,8 +240,8 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
 			"	l	%0,%2\n"
 			"0:	nr	%0,%5\n"
 			"	lr	%1,%0\n"
-			"	or	%0,%2\n"
-			"	or	%1,%3\n"
+			"	or	%0,%3\n"
+			"	or	%1,%4\n"
 			"	cs	%0,%1,%2\n"
 			"	jnl	1f\n"
 			"	xr	%1,%0\n"