summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2013-08-06 02:02:35 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2013-08-07 01:18:08 +0400
commit1599e8fc84dd9c2954df0d4b2db52f7f6719f339 (patch)
tree66408f98ad43cdbd66dc52c45087b5ea54ff6924 /arch/x86/include
parentc095ba7224d8edc71dcef0d655911399a8bd4a3f (diff)
downloadlinux-1599e8fc84dd9c2954df0d4b2db52f7f6719f339.tar.xz
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: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/1375740170-7446-2-git-send-email-andi@firstfloor.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/syscall.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 2e188d68397c..aea284b41312 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -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.