diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 05:54:41 +0100 |
| commit | e898c6706869fdcbd68b1e7fb0ac7461d98710fe (patch) | |
| tree | 28054da88ddda324f78f27083b14328113941fbc /arch/x86/kernel/asm-offsets_64.c | |
| parent | c94082656dac74257f63e91f78d5d458ac781fa5 (diff) | |
| parent | 55283e2537714f9370c4ab847d170acf223daf90 (diff) | |
| download | talos-op-linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.tar.gz talos-op-linux-e898c6706869fdcbd68b1e7fb0ac7461d98710fe.zip | |
Merge branch 'x86/x32' into x86/cleanups
Merge reason: We are going to merge a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/asm-offsets_64.c')
| -rw-r--r-- | arch/x86/kernel/asm-offsets_64.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c index 834e897b1e25..1b4754f82ba7 100644 --- a/arch/x86/kernel/asm-offsets_64.c +++ b/arch/x86/kernel/asm-offsets_64.c @@ -1,6 +1,12 @@ #include <asm/ia32.h> #define __SYSCALL_64(nr, sym, compat) [nr] = 1, +#define __SYSCALL_COMMON(nr, sym, compat) [nr] = 1, +#ifdef CONFIG_X86_X32_ABI +# define __SYSCALL_X32(nr, sym, compat) [nr] = 1, +#else +# define __SYSCALL_X32(nr, sym, compat) /* nothing */ +#endif static char syscalls_64[] = { #include <asm/syscalls_64.h> }; |
