x86: use _ASM_EXTABLE macro in include/asm-x86/futex.h
Use the _ASM_EXTABLE macro from <asm/asm.h>, instead of open-coding __ex_table entires in include/asm-x86/futex.h. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
f832ff18e8
commit
2532ec6d17
1 changed files with 6 additions and 17 deletions
|
@ -17,11 +17,8 @@
|
|||
"2: .section .fixup,\"ax\"\n \
|
||||
3: mov %3, %1\n \
|
||||
jmp 2b\n \
|
||||
.previous\n \
|
||||
.section __ex_table,\"a\"\n \
|
||||
.align 8\n" \
|
||||
_ASM_PTR "1b,3b\n \
|
||||
.previous" \
|
||||
.previous\n" \
|
||||
_ASM_EXTABLE(1b,3b) \
|
||||
: "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
|
||||
: "i" (-EFAULT), "0" (oparg), "1" (0))
|
||||
|
||||
|
@ -35,11 +32,9 @@
|
|||
3: .section .fixup,\"ax\"\n \
|
||||
4: mov %5, %1\n \
|
||||
jmp 3b\n \
|
||||
.previous\n \
|
||||
.section __ex_table,\"a\"\n \
|
||||
.align 8\n" \
|
||||
_ASM_PTR "1b,4b,2b,4b\n \
|
||||
.previous" \
|
||||
.previous\n" \
|
||||
_ASM_EXTABLE(1b,4b) \
|
||||
_ASM_EXTABLE(2b,4b) \
|
||||
: "=&a" (oldval), "=&r" (ret), "+m" (*uaddr), \
|
||||
"=&r" (tem) \
|
||||
: "r" (oparg), "i" (-EFAULT), "1" (0))
|
||||
|
@ -111,18 +106,12 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
|
|||
return -EFAULT;
|
||||
|
||||
__asm__ __volatile__(
|
||||
|
||||
"1: lock; cmpxchgl %3, %1 \n"
|
||||
"2: .section .fixup, \"ax\" \n"
|
||||
"3: mov %2, %0 \n"
|
||||
" jmp 2b \n"
|
||||
" .previous \n"
|
||||
|
||||
" .section __ex_table, \"a\" \n"
|
||||
" .align 8 \n"
|
||||
_ASM_PTR " 1b,3b \n"
|
||||
" .previous \n"
|
||||
|
||||
_ASM_EXTABLE(1b,3b)
|
||||
: "=a" (oldval), "+m" (*uaddr)
|
||||
: "i" (-EFAULT), "r" (newval), "0" (oldval)
|
||||
: "memory"
|
||||
|
|
Reference in a new issue