summaryrefslogtreecommitdiff
path: root/arch/x86/entry/syscall_x32.c
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2020-03-13 22:51:38 +0300
committerThomas Gleixner <tglx@linutronix.de>2020-03-21 18:03:23 +0300
commitcab56d3484d4bb8b21e4d9500392ac1ce99af026 (patch)
treed4a8beaa2f48e787385c32b5b16a5c219823a1e7 /arch/x86/entry/syscall_x32.c
parent8210efcb153625d2bf4bb79875ddc78eee2aba3e (diff)
downloadlinux-cab56d3484d4bb8b21e4d9500392ac1ce99af026.tar.xz
x86/entry: Remove ABI prefixes from functions in syscall tables
Move the ABI prefixes to the __SYSCALL_[abi]() macros. This allows removal of the need to strip the prefix for UML. Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200313195144.164260-13-brgerst@gmail.com
Diffstat (limited to 'arch/x86/entry/syscall_x32.c')
-rw-r--r--arch/x86/entry/syscall_x32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/entry/syscall_x32.c b/arch/x86/entry/syscall_x32.c
index 57a151a3a4b4..2fb09efd7b40 100644
--- a/arch/x86/entry/syscall_x32.c
+++ b/arch/x86/entry/syscall_x32.c
@@ -10,14 +10,14 @@
#define __SYSCALL_64(nr, sym)
-#define __SYSCALL_X32(nr, sym) extern asmlinkage long sym(const struct pt_regs *);
-#define __SYSCALL_COMMON(nr, sym) extern asmlinkage long sym(const struct pt_regs *);
+#define __SYSCALL_X32(nr, sym) extern asmlinkage long __x32_##sym(const struct pt_regs *);
+#define __SYSCALL_COMMON(nr, sym) extern asmlinkage long __x64_##sym(const struct pt_regs *);
#include <asm/syscalls_64.h>
#undef __SYSCALL_X32
#undef __SYSCALL_COMMON
-#define __SYSCALL_X32(nr, sym) [nr] = sym,
-#define __SYSCALL_COMMON(nr, sym) [nr] = sym,
+#define __SYSCALL_X32(nr, sym) [nr] = __x32_##sym,
+#define __SYSCALL_COMMON(nr, sym) [nr] = __x64_##sym,
asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_x32_syscall_max+1] = {
/*