[PATCH 13/32] s390/futex: Convert inline assembly to EX_TABLE_INSN

[Heiko Carstens <hca@linux.ibm.com>]

Convert all futex exception table entries to use EX_TABLE_INSN.
With EX_TABLE_INSN entries always point to the faulting instruction,
so duplicate entries are removed.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---
 arch/s390/include/asm/futex.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h
index 942f21c39697..71e8060637be 100644
--- a/arch/s390/include/asm/futex.h
+++ b/arch/s390/include/asm/futex.h
@@ -23,13 +23,11 @@ __futex_atomic_##name(int oparg, int *old, u32 __user *uaddr)			\
 		"0:	l	%[old],%[uaddr]\n"				\
 		"1:"insn							\
 		"2:	cs	%[old],%[new],%[uaddr]\n"			\
-		"3:	jl	1b\n"						\
+		"	jl	1b\n"						\
 		"	lhi	%[rc],0\n"					\
-		"4:	sacf	768\n"						\
-		EX_TABLE_UA_FAULT(0b, 4b, %[rc])				\
-		EX_TABLE_UA_FAULT(1b, 4b, %[rc])				\
-		EX_TABLE_UA_FAULT(2b, 4b, %[rc])				\
-		EX_TABLE_UA_FAULT(3b, 4b, %[rc])				\
+		"3:	sacf	768\n"						\
+		EX_TABLE_INSN_UA_FAULT(0b, 3b, %[rc])				\
+		EX_TABLE_INSN_UA_FAULT(2b, 3b, %[rc])				\
 		: [rc] "=d" (rc), [old] "=&d" (*old),				\
 		  [new] "=&d" (new), [uaddr] "+Q" (*uaddr)			\
 		: [oparg] "d" (oparg)						\
@@ -86,10 +84,9 @@ int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, u32
 	asm_inline volatile(
 		"	sacf	256\n"
 		"0:	cs	%[old],%[new],%[uaddr]\n"
-		"1:	lhi	%[rc],0\n"
-		"2:	sacf	768\n"
-		EX_TABLE_UA_FAULT(0b, 2b, %[rc])
-		EX_TABLE_UA_FAULT(1b, 2b, %[rc])
+		"	lhi	%[rc],0\n"
+		"1:	sacf	768\n"
+		EX_TABLE_INSN_UA_FAULT(0b, 1b, %[rc])
 		: [rc] "=d" (rc), [old] "+d" (oldval), [uaddr] "+Q" (*uaddr)
 		: [new] "d" (newval)
 		: "cc", "memory");
-- 
2.53.0