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

Commit 034042cc authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86/entry/syscalls: Move syscall table declarations into asm/syscalls.h 



The header was missing some compat declarations.

Also make sys_call_ptr_t have a consistent type.

Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/3166aaff0fb43897998fcb6ef92991533f8c5c6c.1444091585.git.luto@kernel.org


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

arch/x86/entry/syscall_32.c

+1 −4
Original line number Diff line number Diff line
@@ -4,13 +4,12 @@ 
#include <linux/sys.h>

#include <linux/cache.h>

#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#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_syscall_compat_max __NR_syscall_max

#endif



#define __SYSCALL_I386(nr, sym, compat) extern asmlinkage void SYM(sym, compat)(void) ;
@@ -19,8 +18,6 @@ 


#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 ia32_sys_call_table[__NR_syscall_compat_max+1] = {

arch/x86/include/asm/syscall.h

+11 −1
Original line number Diff line number Diff line
@@ -20,9 +20,19 @@ 
#include <asm/thread_info.h>	/* for TS_COMPAT */

#include <asm/unistd.h>



typedef void (*sys_call_ptr_t)(void);

typedef asmlinkage void (*sys_call_ptr_t)(void);

extern const sys_call_ptr_t sys_call_table[];



#if defined(CONFIG_X86_32)

#define ia32_sys_call_table sys_call_table

#define __NR_syscall_compat_max __NR_syscall_max

#define IA32_NR_syscalls NR_syscalls

#endif



#if defined(CONFIG_IA32_EMULATION)

extern const sys_call_ptr_t ia32_sys_call_table[];

#endif



/*

 * Only the low 32 bits of orig_ax are meaningful, so we return int.

 * This importantly ignores the high bits on 64-bit, so comparisons

arch/x86/um/sys_call_table_32.c

+1 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/sys.h>

#include <linux/cache.h>

#include <generated/user_constants.h>

#include <asm/syscall.h>



#define __NO_STUBS
@@ -30,8 +31,6 @@ 
#undef __SYSCALL_I386

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



typedef asmlinkage void (*sys_call_ptr_t)(void);



extern asmlinkage void sys_ni_syscall(void);



const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = {

arch/x86/um/sys_call_table_64.c

+1 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/sys.h>

#include <linux/cache.h>

#include <generated/user_constants.h>

#include <asm/syscall.h>



#define __NO_STUBS
@@ -43,8 +44,6 @@ 
#undef __SYSCALL_64

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



typedef void (*sys_call_ptr_t)(void);



extern void sys_ni_syscall(void);



const sys_call_ptr_t sys_call_table[] ____cacheline_aligned = {