diff options
| author | Brian Gerst <brgerst@gmail.com> | 2015-03-03 22:31:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-04 06:16:21 +0100 |
| commit | 29a5ff97fa0d8045d262a772c3853e3ef1ed98d8 (patch) | |
| tree | 2a23b1bed7694d574d622e7836a33382ff7de337 | |
| parent | b4d8327024637cb2a1f7910dcb5d0ad7a096f473 (diff) | |
| download | linux-29a5ff97fa0d8045d262a772c3853e3ef1ed98d8.tar.gz linux-29a5ff97fa0d8045d262a772c3853e3ef1ed98d8.tar.bz2 linux-29a5ff97fa0d8045d262a772c3853e3ef1ed98d8.zip | |
x86/compat: Remove compat_ni_syscall()
compat_ni_syscall() does the same thing as sys_ni_syscall().
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1425439896-8322-2-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/ia32/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/ia32/nosyscall.c | 7 | ||||
| -rw-r--r-- | arch/x86/ia32/syscall_ia32.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index e785b422b766..e66d85021aa2 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o -obj-$(CONFIG_IA32_EMULATION) += nosyscall.o syscall_ia32.o +obj-$(CONFIG_IA32_EMULATION) += syscall_ia32.o obj-$(CONFIG_IA32_AOUT) += ia32_aout.o diff --git a/arch/x86/ia32/nosyscall.c b/arch/x86/ia32/nosyscall.c deleted file mode 100644 index 51ecd5b4e787..000000000000 --- a/arch/x86/ia32/nosyscall.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <linux/kernel.h> -#include <linux/errno.h> - -long compat_ni_syscall(void) -{ - return -ENOSYS; -} diff --git a/arch/x86/ia32/syscall_ia32.c b/arch/x86/ia32/syscall_ia32.c index 4754ba0f5d9f..3429b14793e3 100644 --- a/arch/x86/ia32/syscall_ia32.c +++ b/arch/x86/ia32/syscall_ia32.c @@ -13,13 +13,13 @@ typedef void (*sys_call_ptr_t)(void); -extern void compat_ni_syscall(void); +extern asmlinkage void sys_ni_syscall(void); const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = { /* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_ia32_syscall_max] = &compat_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &sys_ni_syscall, #include <asm/syscalls_32.h> }; |