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

Commit 2aa4a710 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/compat: Merge native and compat 32-bit syscall tables 



Combine the 32-bit syscall tables into one file.

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-3-git-send-email-brgerst@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 29a5ff97

arch/x86/ia32/Makefile

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



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

obj-$(CONFIG_IA32_EMULATION) += syscall_ia32.o



obj-$(CONFIG_IA32_AOUT) += ia32_aout.o

arch/x86/ia32/syscall_ia32.c

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/* System call table for ia32 emulation. */



#include <linux/linkage.h>

#include <linux/sys.h>

#include <linux/cache.h>

#include <asm/asm-offsets.h>



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void compat(void) ;

#include <asm/syscalls_32.h>

#undef __SYSCALL_I386



#define __SYSCALL_I386(nr, sym, compat) [nr] = compat,



typedef void (*sys_call_ptr_t)(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] = &sys_ni_syscall,

#include <asm/syscalls_32.h>

};

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_X86_32) += i386_ksyms_32.o 
obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_X86_64)	+= mcount_64.o

obj-y			+= syscall_$(BITS).o vsyscall_gtod.o

obj-$(CONFIG_IA32_EMULATION)	+= syscall_32.o

obj-$(CONFIG_X86_VSYSCALL_EMULATION)	+= vsyscall_64.o vsyscall_emu_64.o

obj-$(CONFIG_X86_ESPFIX64)	+= espfix_64.o

obj-$(CONFIG_SYSFS)	+= ksysfs.o

arch/x86/kernel/syscall_32.c

+12 −4
Original line number Diff line number Diff line
@@ -5,21 +5,29 @@ 
#include <linux/cache.h>

#include <asm/asm-offsets.h>



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void sym(void) ;

#ifdef CONFIG_IA32_EMULATION

#define SYM(sym, compat) compat

#else

#define SYM(sym, compat) sym

#define ia32_sys_call_table sys_call_table

#define __NR_ia32_syscall_max __NR_syscall_max

#endif



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void SYM(sym, compat)(void) ;

#include <asm/syscalls_32.h>

#undef __SYSCALL_I386



#define __SYSCALL_I386(nr, sym, compat) [nr] = sym,

#define __SYSCALL_I386(nr, sym, compat) [nr] = SYM(sym, compat),



typedef asmlinkage void (*sys_call_ptr_t)(void);



extern asmlinkage void sys_ni_syscall(void);



__visible const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {

__visible 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_syscall_max] = &sys_ni_syscall,

	[0 ... __NR_ia32_syscall_max] = &sys_ni_syscall,

#include <asm/syscalls_32.h>

};