Skip to content

Commit

Permalink
x86/compat: Remove compat_ni_syscall()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian Gerst authored and Ingo Molnar committed Mar 4, 2015
1 parent b4d8327 commit 29a5ff9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion arch/x86/ia32/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 0 additions & 7 deletions arch/x86/ia32/nosyscall.c

This file was deleted.

4 changes: 2 additions & 2 deletions arch/x86/ia32/syscall_ia32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
};

0 comments on commit 29a5ff9

Please sign in to comment.