diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:20 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-11-01 12:01:20 +0800 |
commit | 79df8fa79b6a2aced892ad2b2c9832e7d9bdea6b (patch) | |
tree | 725b3b29e466e846837cf56cec1bafd99fe5ca71 /arch/x86/include | |
parent | c11a255c622e7a2d312f4080c6ef529dd67b3c38 (diff) | |
parent | 1714a3e139090705a0bd862a8b7bba930181cfbd (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/uaccess.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index b8ff6aba0960..dbe64f27280e 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -405,11 +405,7 @@ do { \ #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ asm volatile("1: mov"itype" %1,%"rtype"0\n" \ "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3:xor"itype" %"rtype"0,%"rtype"0\n" \ - " jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE_EX(1b, 3b) \ + _ASM_EXTABLE_EX(1b, 2b) \ : ltype(x) : "m" (__m(addr))) #define __put_user_nocheck(x, ptr, size) \ |