summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/usercopy_64.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-03-23 09:58:40 +0100
committerJiri Kosina <jkosina@suse.cz>2022-03-23 09:58:40 +0100
commitb690490d6d466972ade172ee2e7f6ffa49e7e910 (patch)
tree50a93da28c9128e19eb7a3038aecf75dab6b36e1 /arch/x86/lib/usercopy_64.c
parentHID: intel-ish-hid: Use dma_alloc_coherent for firmware update (diff)
parentHID: amd_sfh: Remove useless DMA-32 fallback configuration (diff)
downloadlinux-b690490d6d466972ade172ee2e7f6ffa49e7e910.tar.xz
linux-b690490d6d466972ade172ee2e7f6ffa49e7e910.zip
Merge branch 'for-5.18/amd-sfh' into for-linus
- dead code elimination (Christophe JAILLET)
Diffstat (limited to 'arch/x86/lib/usercopy_64.c')
-rw-r--r--arch/x86/lib/usercopy_64.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
index 508c81e97ab1..0402a749f3a0 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@ -35,12 +35,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
" incq %[dst]\n"
" decl %%ecx ; jnz 1b\n"
"2:\n"
- ".section .fixup,\"ax\"\n"
- "3: lea 0(%[size1],%[size8],8),%[size8]\n"
- " jmp 2b\n"
- ".previous\n"
- _ASM_EXTABLE_UA(0b, 3b)
+
+ _ASM_EXTABLE_TYPE_REG(0b, 2b, EX_TYPE_UCOPY_LEN8, %[size1])
_ASM_EXTABLE_UA(1b, 2b)
+
: [size8] "=&c"(size), [dst] "=&D" (__d0)
: [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr));
clac();