summaryrefslogtreecommitdiff
path: root/arch/x86/entry
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2020-03-13 22:51:32 +0300
committerThomas Gleixner <tglx@linutronix.de>2020-03-21 18:03:20 +0300
commitcc42c045af1ff4dee875196f8fe7d6ed1f29ea64 (patch)
treea56e67651ad9ce1a480d735272d353ede76cd096 /arch/x86/entry
parent27dd84fafcd5e3c565164bb303fe8ec8ef59e147 (diff)
downloadlinux-cc42c045af1ff4dee875196f8fe7d6ed1f29ea64.tar.xz
x86/entry/64: Move sys_ni_syscall stub to common.c
so it can be available to multiple syscall tables. Also directly return -ENOSYS instead of bouncing to the generic sys_ni_syscall(). Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200313195144.164260-7-brgerst@gmail.com
Diffstat (limited to 'arch/x86/entry')
-rw-r--r--arch/x86/entry/common.c7
-rw-r--r--arch/x86/entry/syscall_64.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 9747876980b5..149bf54501ff 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -438,3 +438,10 @@ __visible long do_fast_syscall_32(struct pt_regs *regs)
#endif
}
#endif
+
+#ifdef CONFIG_X86_64
+SYSCALL_DEFINE0(ni_syscall)
+{
+ return -ENOSYS;
+}
+#endif
diff --git a/arch/x86/entry/syscall_64.c b/arch/x86/entry/syscall_64.c
index adf619a856e8..058dc1b73e96 100644
--- a/arch/x86/entry/syscall_64.c
+++ b/arch/x86/entry/syscall_64.c
@@ -8,13 +8,6 @@
#include <asm/asm-offsets.h>
#include <asm/syscall.h>
-extern asmlinkage long sys_ni_syscall(void);
-
-SYSCALL_DEFINE0(ni_syscall)
-{
- return sys_ni_syscall();
-}
-
#define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);
#define __SYSCALL_X32(nr, sym, qual) __SYSCALL_64(nr, sym, qual)
#include <asm/syscalls_64.h>