diff options
| author |   David Howells <dhowells@redhat.com> | 2012-12-14 22:37:13 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-12-14 22:37:13 +0000 |
| commit | af170c5061dd78512c469e6e2d211980cdb2c193 (patch) | |
| tree | a3bb86ee66b69f832b6783124cc0482ce8058cd8 /arch/x86/include/asm/unistd.h | |
| parent | Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| download | wireguard-linux-af170c5061dd78512c469e6e2d211980cdb2c193.tar.xz wireguard-linux-af170c5061dd78512c469e6e2d211980cdb2c193.zip | |
UAPI: (Scripted) Disintegrate arch/x86/include/asm
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/unistd.h')
| -rw-r--r-- | arch/x86/include/asm/unistd.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h index 0e7dea7d3669..1003e69a40d9 100644 --- a/arch/x86/include/asm/unistd.h +++ b/arch/x86/include/asm/unistd.h @@ -1,10 +1,8 @@ #ifndef _ASM_X86_UNISTD_H #define _ASM_X86_UNISTD_H 1 -/* x32 syscall flag bit */ -#define __X32_SYSCALL_BIT 0x40000000 +#include <uapi/asm/unistd.h> -#ifdef __KERNEL__ # ifdef CONFIG_X86_X32_ABI # define __SYSCALL_MASK (~(__X32_SYSCALL_BIT)) @@ -63,14 +61,4 @@ */ # define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") -#else -# ifdef __i386__ -# include <asm/unistd_32.h> -# elif defined(__ILP32__) -# include <asm/unistd_x32.h> -# else -# include <asm/unistd_64.h> -# endif -#endif - #endif /* _ASM_X86_UNISTD_H */ |