Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a5ff97 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/compat: Remove compat_ni_syscall() 



compat_ni_syscall() does the same thing as sys_ni_syscall().

Signed-off-by: default avatarBrian 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: default avatarIngo Molnar <mingo@kernel.org>
parent b4d83270

arch/x86/ia32/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

#





obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o

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

obj-$(CONFIG_IA32_AOUT) += ia32_aout.o

arch/x86/ia32/nosyscall.c

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/errno.h>



long compat_ni_syscall(void)

{

	return -ENOSYS;

}

arch/x86/ia32/syscall_ia32.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -13,13 +13,13 @@ 




typedef void (*sys_call_ptr_t)(void);

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] = {

const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {

	/*

	/*

	 * Smells like a compiler bug -- it doesn't work

	 * Smells like a compiler bug -- it doesn't work

	 * when the & below is removed.

	 * 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>

#include <asm/syscalls_32.h>

};
 
};