aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-02-14 17:18:50 -0500
committerH. Peter Anvin <hpa@zytor.com>2012-02-20 15:48:49 -0500
commit6630f11ba54414b9870d87dfef2bee467bfa842a (patch)
tree2162fee8b43a3ab3df33bd2687c01e0c651a5686 /arch/x86/kernel
parent2c73ce734653f96542a070f3c3b3e3d1cd0fba02 (diff)
x32: Add x32 system calls to syscall/syscall_64.tbl
Split the 64-bit system calls into "64" (64-bit only) and "common" (64-bit or x32) and add the x32 system call numbers. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/asm-offsets_64.c2
-rw-r--r--arch/x86/kernel/syscall_64.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 834e897b1e2..c3354f7b0a0 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -1,6 +1,8 @@
1#include <asm/ia32.h> 1#include <asm/ia32.h>
2 2
3#define __SYSCALL_64(nr, sym, compat) [nr] = 1, 3#define __SYSCALL_64(nr, sym, compat) [nr] = 1,
4#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1,
5#define __SYSCALL_X32(nr, sym, compat) /* Not yet */
4static char syscalls_64[] = { 6static char syscalls_64[] = {
5#include <asm/syscalls_64.h> 7#include <asm/syscalls_64.h>
6}; 8};
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c
index 7ac7943be02..26c4ca1f20e 100644
--- a/arch/x86/kernel/syscall_64.c
+++ b/arch/x86/kernel/syscall_64.c
@@ -5,6 +5,9 @@
5#include <linux/cache.h> 5#include <linux/cache.h>
6#include <asm/asm-offsets.h> 6#include <asm/asm-offsets.h>
7 7
8#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
9#define __SYSCALL_X32(nr, sym, compat) /* Not yet */
10
8#define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ; 11#define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ;
9#include <asm/syscalls_64.h> 12#include <asm/syscalls_64.h>
10#undef __SYSCALL_64 13#undef __SYSCALL_64