From 0702b9183a1b74af2181ab0ddedf59c9144a3bfe Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 8 Jun 2006 01:36:20 -0700
Subject: [PATCH] --- yaml --- r: 27161 b: refs/heads/master c:
 bafe00cc9297ca77b66e5c83e5e65e17c0c997c8 h: refs/heads/master i:   27159:
 ed96fe215c65b9127c91f19356108d75d166ca13 v: v3

---
 [refs]                         |  2 +-
 trunk/include/asm-s390/futex.h | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 357de97c8ece..4577642333e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71601e2b33dad9acb8d7844f7321f90ed9d1bce8
+refs/heads/master: bafe00cc9297ca77b66e5c83e5e65e17c0c997c8
diff --git a/trunk/include/asm-s390/futex.h b/trunk/include/asm-s390/futex.h
index 40c25e166a9b..1802775568b9 100644
--- a/trunk/include/asm-s390/futex.h
+++ b/trunk/include/asm-s390/futex.h
@@ -11,23 +11,24 @@
 #define __futex_atomic_fixup \
 		     ".section __ex_table,\"a\"\n"			\
 		     "   .align 4\n"					\
-		     "   .long  0b,2b,1b,2b\n"				\
+		     "   .long  0b,4b,2b,4b,3b,4b\n"			\
 		     ".previous"
 #else /* __s390x__ */
 #define __futex_atomic_fixup \
 		     ".section __ex_table,\"a\"\n"			\
 		     "   .align 8\n"					\
-		     "   .quad  0b,2b,1b,2b\n"				\
+		     "   .quad  0b,4b,2b,4b,3b,4b\n"			\
 		     ".previous"
 #endif /* __s390x__ */
 
 #define __futex_atomic_op(insn, ret, oldval, newval, uaddr, oparg)	\
-	asm volatile("   l   %1,0(%6)\n"				\
-		     "0: " insn						\
-		     "   cs  %1,%2,0(%6)\n"				\
-		     "1: jl  0b\n"					\
+	asm volatile("   sacf 256\n"					\
+		     "0: l   %1,0(%6)\n"				\
+		     "1: " insn						\
+		     "2: cs  %1,%2,0(%6)\n"				\
+		     "3: jl  1b\n"					\
 		     "   lhi %0,0\n"					\
-		     "2:\n"						\
+		     "4: sacf 0\n"					\
 		     __futex_atomic_fixup				\
 		     : "=d" (ret), "=&d" (oldval), "=&d" (newval),	\
 		       "=m" (*uaddr)					\