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

Commit 1599e8fc authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86: Fix sys_call_table type in asm/syscall.h 



Make the sys_call_table type defined in asm/syscall.h match
the definition in syscall_64.c

v2: include asm/syscall.h in syscall_64.c too. I left uml alone
because it doesn't have an syscall.h on its own and including
the native one leads to other errors.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-2-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: Richard Weinberger <richard@nod.at>
parent c095ba72

arch/x86/include/asm/syscall.h

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <asm/thread_info.h>	/* for TS_COMPAT */

#include <asm/unistd.h>



extern const unsigned long sys_call_table[];

typedef void (*sys_call_ptr_t)(void);

extern const sys_call_ptr_t sys_call_table[];



/*

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

arch/x86/kernel/syscall_64.c

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

#include <linux/cache.h>

#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
@@ -19,8 +20,6 @@ 


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