Merge tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 uapi disintegration from Catalin Marinas: "UAPI headers for arm64 together with some clean-up to make it possible: - Do not export the COMPAT_* definitions to user - Simplify the compat unistd32.h definitions and remove the __SYSCALL_COMPAT guard - Disintegrate the arch/arm64/include/asm/* headers" * tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: UAPI: (Scripted) Disintegrate arch/arm64/include/asm arm64: Do not export the compat-specific definitions to the user arm64: Do not include asm/unistd32.h in asm/unistd.h arm64: Remove unused definitions from asm/unistd32.h

Merge tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 uapi disintegration from Catalin Marinas: "UAPI headers for arm64 together with some clean-up to make it possible: - Do not export the COMPAT_* definitions to user - Simplify the compat unistd32.h definitions and remove the __SYSCALL_COMPAT guard - Disintegrate the arch/arm64/include/asm/* headers" * tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: UAPI: (Scripted) Disintegrate arch/arm64/include/asm arm64: Do not export the compat-specific definitions to the user arm64: Do not include asm/unistd32.h in asm/unistd.h arm64: Remove unused definitions from asm/unistd32.h
b4fe19f7 · Linus Torvalds · ff69497a · 48b3b321 · b4fe19f7 · b4fe19f7
Commit b4fe19f7 authored Oct 13, 2012 by Linus Torvalds
27 changed files
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
-include include/asm-generic/Kbuild.asm
-header-y += hwcap.h
 generic-y += bug.h
 generic-y += bugs.h

--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -16,11 +16,7 @@
 #ifndef __ASM_HWCAP_H
 #define __ASM_HWCAP_H
-/*
+#include <uapi/asm/hwcap.h>
- * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
- */
-#define HWCAP_FP		(1 << 0)
-#define HWCAP_ASIMD		(1 << 1)
 #define COMPAT_HWCAP_HALF	(1 << 1)
 #define COMPAT_HWCAP_THUMB	(1 << 2)
@@ -35,7 +31,6 @@
 #define COMPAT_HWCAP_IDIVT	(1 << 18)
 #define COMPAT_HWCAP_IDIV	(COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT)
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 /*
 * This yields a mask that user programs can use to figure out what
@@ -51,5 +46,3 @@
 extern unsigned int elf_hwcap;
 #endif
 #endif
-#endif
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -19,9 +19,7 @@
 #ifndef __ASM_PTRACE_H
 #define __ASM_PTRACE_H
-#include <linux/types.h>
+#include <uapi/asm/ptrace.h>
-#include <asm/hwcap.h>
 /* AArch32-specific ptrace requests */
 #define COMPAT_PTRACE_GETREGS		12
@@ -32,80 +30,18 @@
 #define COMPAT_PTRACE_SETVFPREGS	28
 #define COMPAT_PTRACE_GETHBPREGS	29
 #define COMPAT_PTRACE_SETHBPREGS	30
-/*
- * PSR bits
- */
-#define PSR_MODE_EL0t	0x00000000
-#define PSR_MODE_EL1t	0x00000004
-#define PSR_MODE_EL1h	0x00000005
-#define PSR_MODE_EL2t	0x00000008
-#define PSR_MODE_EL2h	0x00000009
-#define PSR_MODE_EL3t	0x0000000c
-#define PSR_MODE_EL3h	0x0000000d
-#define PSR_MODE_MASK	0x0000000f
-/* AArch32 CPSR bits */
-#define PSR_MODE32_BIT		0x00000010
 #define COMPAT_PSR_MODE_USR	0x00000010
 #define COMPAT_PSR_T_BIT	0x00000020
 #define COMPAT_PSR_IT_MASK	0x0600fc00	/* If-Then execution state mask */
-/* AArch64 SPSR bits */
-#define PSR_F_BIT	0x00000040
-#define PSR_I_BIT	0x00000080
-#define PSR_A_BIT	0x00000100
-#define PSR_D_BIT	0x00000200
-#define PSR_Q_BIT	0x08000000
-#define PSR_V_BIT	0x10000000
-#define PSR_C_BIT	0x20000000
-#define PSR_Z_BIT	0x40000000
-#define PSR_N_BIT	0x80000000
-/*
- * Groups of PSR bits
- */
-#define PSR_f		0xff000000	/* Flags		*/
-#define PSR_s		0x00ff0000	/* Status		*/
-#define PSR_x		0x0000ff00	/* Extension		*/
-#define PSR_c		0x000000ff	/* Control		*/
 /*
 * These are 'magic' values for PTRACE_PEEKUSR that return info about where a
 * process is located in memory.
 */
-#define PT_TEXT_ADDR		0x10000
+#define COMPAT_PT_TEXT_ADDR		0x10000
-#define PT_DATA_ADDR		0x10004
+#define COMPAT_PT_DATA_ADDR		0x10004
-#define PT_TEXT_END_ADDR	0x10008
+#define COMPAT_PT_TEXT_END_ADDR		0x10008
 #ifndef __ASSEMBLY__
-/*
- * User structures for general purpose, floating point and debug registers.
- */
-struct user_pt_regs {
-	__u64		regs[31];
-	__u64		sp;
-	__u64		pc;
-	__u64		pstate;
-};
-struct user_fpsimd_state {
-	__uint128_t	vregs[32];
-	__u32		fpsr;
-	__u32		fpcr;
-};
-struct user_hwdebug_state {
-	__u32		dbg_info;
-	struct {
-		__u64	addr;
-		__u32	ctrl;
-	}		dbg_regs[16];
-};
-#ifdef __KERNEL__
 /* sizeof(struct user) for AArch32 */
 #define COMPAT_USER_SZ	296
 /* AArch32 uses x13 as the stack pointer... */
@@ -200,8 +136,5 @@ extern unsigned long profile_pc(struct pt_regs *regs);
 extern int aarch32_break_trap(struct pt_regs *regs);
-#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 #endif
--- a/arch/arm64/include/asm/sigcontext.h
+++ b/arch/arm64/include/asm/sigcontext.h
@@ -16,44 +16,8 @@
 #ifndef __ASM_SIGCONTEXT_H
 #define __ASM_SIGCONTEXT_H
-#include <linux/types.h>
+#include <uapi/asm/sigcontext.h>
-/*
- * Signal context structure - contains all info to do with the state
- * before the signal handler was invoked.
- */
-struct sigcontext {
-	__u64 fault_address;
-	/* AArch64 registers */
-	__u64 regs[31];
-	__u64 sp;
-	__u64 pc;
-	__u64 pstate;
-	/* 4K reserved for FP/SIMD state and future expansion */
-	__u8 __reserved[4096] __attribute__((__aligned__(16)));
-};
-/*
- * Header to be used at the beginning of structures extending the user
- * context. Such structures must be placed after the rt_sigframe on the stack
- * and be 16-byte aligned. The last structure must be a dummy one with the
- * magic and size set to 0.
- */
-struct _aarch64_ctx {
-	__u32 magic;
-	__u32 size;
-};
-#define FPSIMD_MAGIC	0x46508001
-struct fpsimd_context {
-	struct _aarch64_ctx head;
-	__u32 fpsr;
-	__u32 fpcr;
-	__uint128_t vregs[32];
-};
-#ifdef __KERNEL__
 /*
 * Auxiliary context saved in the sigcontext.__reserved array. Not exported to
 * user space as it will change with the addition of new context. User space
@@ -65,5 +29,3 @@ struct aux_context {
 	struct _aarch64_ctx end;
 };
 #endif
-#endif
--- a/arch/arm64/include/asm/stat.h
+++ b/arch/arm64/include/asm/stat.h
@@ -16,9 +16,8 @@
 #ifndef __ASM_STAT_H
 #define __ASM_STAT_H
-#include <asm-generic/stat.h>
+#include <uapi/asm/stat.h>
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
 #include <asm/compat.h>
@@ -60,5 +59,3 @@ struct stat64 {
 #endif
 #endif
-#endif
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -13,13 +13,17 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __SYSCALL_COMPAT
-#include <asm-generic/unistd.h>
-#endif
-#ifdef __KERNEL__
 #ifdef CONFIG_COMPAT
-#include <asm/unistd32.h>
+#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
-#endif
+#define __ARCH_WANT_COMPAT_STAT64
+#define __ARCH_WANT_SYS_GETHOSTNAME
+#define __ARCH_WANT_SYS_PAUSE
+#define __ARCH_WANT_SYS_GETPGRP
+#define __ARCH_WANT_SYS_LLSEEK
+#define __ARCH_WANT_SYS_NICE
+#define __ARCH_WANT_SYS_SIGPENDING
+#define __ARCH_WANT_SYS_SIGPROCMASK
+#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
+#define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
+#include <uapi/asm/unistd.h>
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
 /*
- * Based on arch/arm/include/asm/unistd.h
+ * AArch32 (compat) system call definitions.
 *
 * Copyright (C) 2001-2005 Russell King
 * Copyright (C) 2012 ARM Ltd.
@@ -21,715 +21,390 @@
 #define __SYSCALL(x, y)
 #endif
-/*
+__SYSCALL(0,   sys_restart_syscall)
- * This file contains the system call numbers.
+__SYSCALL(1,   sys_exit)
- */
+__SYSCALL(2,   compat_sys_fork_wrapper)
+__SYSCALL(3,   sys_read)
-#ifdef __SYSCALL_COMPAT
+__SYSCALL(4,   sys_write)
+__SYSCALL(5,   compat_sys_open)
-#define __NR_restart_syscall		0
+__SYSCALL(6,   sys_close)
-__SYSCALL(__NR_restart_syscall, sys_restart_syscall)
-#define __NR_exit			1
-__SYSCALL(__NR_exit, sys_exit)
-#define __NR_fork			2
-__SYSCALL(__NR_fork, sys_fork)
-#define __NR_read			3
-__SYSCALL(__NR_read, sys_read)
-#define __NR_write			4
-__SYSCALL(__NR_write, sys_write)
-#define __NR_open			5
-__SYSCALL(__NR_open, sys_open)
-#define __NR_close			6
-__SYSCALL(__NR_close, sys_close)
 __SYSCALL(7,   sys_ni_syscall)			/* 7 was sys_waitpid */
-#define __NR_creat			8
+__SYSCALL(8,   sys_creat)
-__SYSCALL(__NR_creat, sys_creat)
+__SYSCALL(9,   sys_link)
-#define __NR_link			9
+__SYSCALL(10,  sys_unlink)
-__SYSCALL(__NR_link, sys_link)
+__SYSCALL(11,  compat_sys_execve_wrapper)
-#define __NR_unlink			10
+__SYSCALL(12,  sys_chdir)
-__SYSCALL(__NR_unlink, sys_unlink)
-#define __NR_execve			11
-__SYSCALL(__NR_execve, sys_execve)
-#define __NR_chdir			12
-__SYSCALL(__NR_chdir, sys_chdir)
 __SYSCALL(13,  sys_ni_syscall)			/* 13 was sys_time */
-#define __NR_mknod			14
+__SYSCALL(14,  sys_mknod)
-__SYSCALL(__NR_mknod, sys_mknod)
+__SYSCALL(15,  sys_chmod)
-#define __NR_chmod			15
+__SYSCALL(16,  sys_lchown16)
-__SYSCALL(__NR_chmod, sys_chmod)
-#define __NR_lchown			16
-__SYSCALL(__NR_lchown, sys_lchown16)
 __SYSCALL(17,  sys_ni_syscall)			/* 17 was sys_break */
 __SYSCALL(18,  sys_ni_syscall)			/* 18 was sys_stat */
-#define __NR_lseek			19
+__SYSCALL(19,  compat_sys_lseek_wrapper)
-__SYSCALL(__NR_lseek, sys_lseek)
+__SYSCALL(20,  sys_getpid)
-#define __NR_getpid			20
+__SYSCALL(21,  compat_sys_mount)
-__SYSCALL(__NR_getpid, sys_getpid)
-#define __NR_mount			21
-__SYSCALL(__NR_mount, sys_mount)
 __SYSCALL(22,  sys_ni_syscall)			/* 22 was sys_umount */
-#define __NR_setuid			23
+__SYSCALL(23,  sys_setuid16)
-__SYSCALL(__NR_setuid, sys_setuid16)
+__SYSCALL(24,  sys_getuid16)
-#define __NR_getuid			24
-__SYSCALL(__NR_getuid, sys_getuid16)
 __SYSCALL(25,  sys_ni_syscall)			/* 25 was sys_stime */
-#define __NR_ptrace			26
+__SYSCALL(26,  compat_sys_ptrace)
-__SYSCALL(__NR_ptrace, sys_ptrace)
 __SYSCALL(27,  sys_ni_syscall)			/* 27 was sys_alarm */
 __SYSCALL(28,  sys_ni_syscall)			/* 28 was sys_fstat */
-#define __NR_pause			29
+__SYSCALL(29,  sys_pause)
-__SYSCALL(__NR_pause, sys_pause)
 __SYSCALL(30,  sys_ni_syscall)			/* 30 was sys_utime */
 __SYSCALL(31,  sys_ni_syscall)			/* 31 was sys_stty */
 __SYSCALL(32,  sys_ni_syscall)			/* 32 was sys_gtty */
-#define __NR_access			33
+__SYSCALL(33,  sys_access)
-__SYSCALL(__NR_access, sys_access)
+__SYSCALL(34,  sys_nice)
-#define __NR_nice			34
-__SYSCALL(__NR_nice, sys_nice)
 __SYSCALL(35,  sys_ni_syscall)			/* 35 was sys_ftime */
-#define __NR_sync			36
+__SYSCALL(36,  sys_sync)
-__SYSCALL(__NR_sync, sys_sync)
+__SYSCALL(37,  sys_kill)
-#define __NR_kill			37
+__SYSCALL(38,  sys_rename)
-__SYSCALL(__NR_kill, sys_kill)
+__SYSCALL(39,  sys_mkdir)
-#define __NR_rename			38
+__SYSCALL(40,  sys_rmdir)
-__SYSCALL(__NR_rename, sys_rename)
+__SYSCALL(41,  sys_dup)
-#define __NR_mkdir			39
+__SYSCALL(42,  sys_pipe)
-__SYSCALL(__NR_mkdir, sys_mkdir)
+__SYSCALL(43,  compat_sys_times)
-#define __NR_rmdir			40
-__SYSCALL(__NR_rmdir, sys_rmdir)
-#define __NR_dup			41
-__SYSCALL(__NR_dup, sys_dup)
-#define __NR_pipe			42
-__SYSCALL(__NR_pipe, sys_pipe)
-#define __NR_times			43
-__SYSCALL(__NR_times, sys_times)
 __SYSCALL(44,  sys_ni_syscall)			/* 44 was sys_prof */
-#define __NR_brk			45
+__SYSCALL(45,  sys_brk)
-__SYSCALL(__NR_brk, sys_brk)
+__SYSCALL(46,  sys_setgid16)
-#define __NR_setgid			46
+__SYSCALL(47,  sys_getgid16)
-__SYSCALL(__NR_setgid, sys_setgid16)
-#define __NR_getgid			47
-__SYSCALL(__NR_getgid, sys_getgid16)
 __SYSCALL(48,  sys_ni_syscall)			/* 48 was sys_signal */
-#define __NR_geteuid			49
+__SYSCALL(49,  sys_geteuid16)
-__SYSCALL(__NR_geteuid, sys_geteuid16)
+__SYSCALL(50,  sys_getegid16)
-#define __NR_getegid			50
+__SYSCALL(51,  sys_acct)
-__SYSCALL(__NR_getegid, sys_getegid16)
+__SYSCALL(52,  sys_umount)
-#define __NR_acct			51
-__SYSCALL(__NR_acct, sys_acct)
-#define __NR_umount2			52
-__SYSCALL(__NR_umount2, sys_umount)
 __SYSCALL(53,  sys_ni_syscall)			/* 53 was sys_lock */
-#define __NR_ioctl			54
+__SYSCALL(54,  compat_sys_ioctl)
-__SYSCALL(__NR_ioctl, sys_ioctl)
+__SYSCALL(55,  compat_sys_fcntl)
-#define __NR_fcntl			55
-__SYSCALL(__NR_fcntl, sys_fcntl)
 __SYSCALL(56,  sys_ni_syscall)			/* 56 was sys_mpx */
-#define __NR_setpgid			57
+__SYSCALL(57,  sys_setpgid)
-__SYSCALL(__NR_setpgid, sys_setpgid)
 __SYSCALL(58,  sys_ni_syscall)			/* 58 was sys_ulimit */
 __SYSCALL(59,  sys_ni_syscall)			/* 59 was sys_olduname */
-#define __NR_umask			60
+__SYSCALL(60,  sys_umask)
-__SYSCALL(__NR_umask, sys_umask)
+__SYSCALL(61,  sys_chroot)
-#define __NR_chroot			61
+__SYSCALL(62,  compat_sys_ustat)
-__SYSCALL(__NR_chroot, sys_chroot)
+__SYSCALL(63,  sys_dup2)
-#define __NR_ustat			62
+__SYSCALL(64,  sys_getppid)
-__SYSCALL(__NR_ustat, sys_ustat)
+__SYSCALL(65,  sys_getpgrp)
-#define __NR_dup2			63
+__SYSCALL(66,  sys_setsid)
-__SYSCALL(__NR_dup2, sys_dup2)
+__SYSCALL(67,  compat_sys_sigaction)
-#define __NR_getppid			64
-__SYSCALL(__NR_getppid, sys_getppid)
-#define __NR_getpgrp			65
-__SYSCALL(__NR_getpgrp, sys_getpgrp)
-#define __NR_setsid			66
-__SYSCALL(__NR_setsid, sys_setsid)
-#define __NR_sigaction			67
-__SYSCALL(__NR_sigaction, sys_sigaction)
 __SYSCALL(68,  sys_ni_syscall)			/* 68 was sys_sgetmask */
 __SYSCALL(69,  sys_ni_syscall)			/* 69 was sys_ssetmask */
-#define __NR_setreuid			70
+__SYSCALL(70,  sys_setreuid16)
-__SYSCALL(__NR_setreuid, sys_setreuid16)
+__SYSCALL(71,  sys_setregid16)
-#define __NR_setregid			71
+__SYSCALL(72,  compat_sys_sigsuspend)
-__SYSCALL(__NR_setregid, sys_setregid16)
+__SYSCALL(73,  compat_sys_sigpending)
-#define __NR_sigsuspend			72
+__SYSCALL(74,  sys_sethostname)
-__SYSCALL(__NR_sigsuspend, sys_sigsuspend)
+__SYSCALL(75,  compat_sys_setrlimit)
-#define __NR_sigpending			73
+__SYSCALL(76,  sys_ni_syscall)			/* 76 was compat_sys_getrlimit */
-__SYSCALL(__NR_sigpending, sys_sigpending)
+__SYSCALL(77,  compat_sys_getrusage)
-#define __NR_sethostname		74
+__SYSCALL(78,  compat_sys_gettimeofday)
-__SYSCALL(__NR_sethostname, sys_sethostname)
+__SYSCALL(79,  compat_sys_settimeofday)
-#define __NR_setrlimit			75
+__SYSCALL(80,  sys_getgroups16)
-__SYSCALL(__NR_setrlimit, sys_setrlimit)
+__SYSCALL(81,  sys_setgroups16)
-__SYSCALL(76, sys_ni_syscall)		/* 76 was sys_getrlimit */
+__SYSCALL(82,  sys_ni_syscall)			/* 82 was compat_sys_select */
-#define __NR_getrusage			77
+__SYSCALL(83,  sys_symlink)
-__SYSCALL(__NR_getrusage, sys_getrusage)
-#define __NR_gettimeofday		78
-__SYSCALL(__NR_gettimeofday, sys_gettimeofday)
-#define __NR_settimeofday		79
-__SYSCALL(__NR_settimeofday, sys_settimeofday)
-#define __NR_getgroups			80
-__SYSCALL(__NR_getgroups, sys_getgroups16)
-#define __NR_setgroups			81
-__SYSCALL(__NR_setgroups, sys_setgroups16)
-__SYSCALL(82, sys_ni_syscall)		/* 82 was sys_select */
-#define __NR_symlink			83
-__SYSCALL(__NR_symlink, sys_symlink)
 __SYSCALL(84,  sys_ni_syscall)			/* 84 was sys_lstat */
-#define __NR_readlink			85
+__SYSCALL(85,  sys_readlink)
-__SYSCALL(__NR_readlink, sys_readlink)
+__SYSCALL(86,  sys_uselib)
-#define __NR_uselib			86
+__SYSCALL(87,  sys_swapon)
-__SYSCALL(__NR_uselib, sys_uselib)
+__SYSCALL(88,  sys_reboot)
-#define __NR_swapon			87
-__SYSCALL(__NR_swapon, sys_swapon)
-#define __NR_reboot			88
-__SYSCALL(__NR_reboot, sys_reboot)
 __SYSCALL(89,  sys_ni_syscall)			/* 89 was sys_readdir */
 __SYSCALL(90,  sys_ni_syscall)			/* 90 was sys_mmap */
-#define __NR_munmap			91
+__SYSCALL(91,  sys_munmap)
-__SYSCALL(__NR_munmap, sys_munmap)
+__SYSCALL(92,  sys_truncate)
-#define __NR_truncate			92
+__SYSCALL(93,  sys_ftruncate)
-__SYSCALL(__NR_truncate, sys_truncate)
+__SYSCALL(94,  sys_fchmod)
-#define __NR_ftruncate			93
+__SYSCALL(95,  sys_fchown16)
-__SYSCALL(__NR_ftruncate, sys_ftruncate)
+__SYSCALL(96,  sys_getpriority)
-#define __NR_fchmod			94
+__SYSCALL(97,  sys_setpriority)
-__SYSCALL(__NR_fchmod, sys_fchmod)
-#define __NR_fchown			95
-__SYSCALL(__NR_fchown, sys_fchown16)
-#define __NR_getpriority		96
-__SYSCALL(__NR_getpriority, sys_getpriority)
-#define __NR_setpriority		97
-__SYSCALL(__NR_setpriority, sys_setpriority)
 __SYSCALL(98,  sys_ni_syscall)			/* 98 was sys_profil */
-#define __NR_statfs			99
+__SYSCALL(99,  compat_sys_statfs)
-__SYSCALL(__NR_statfs, sys_statfs)
+__SYSCALL(100, compat_sys_fstatfs)
-#define __NR_fstatfs			100
-__SYSCALL(__NR_fstatfs, sys_fstatfs)
 __SYSCALL(101, sys_ni_syscall)			/* 101 was sys_ioperm */
 __SYSCALL(102, sys_ni_syscall)			/* 102 was sys_socketcall */
-#define __NR_syslog			103
+__SYSCALL(103, sys_syslog)
-__SYSCALL(__NR_syslog, sys_syslog)
+__SYSCALL(104, compat_sys_setitimer)
-#define __NR_setitimer			104
+__SYSCALL(105, compat_sys_getitimer)
-__SYSCALL(__NR_setitimer, sys_setitimer)
+__SYSCALL(106, compat_sys_newstat)
-#define __NR_getitimer			105
+__SYSCALL(107, compat_sys_newlstat)
-__SYSCALL(__NR_getitimer, sys_getitimer)
+__SYSCALL(108, compat_sys_newfstat)
-#define __NR_stat			106
-__SYSCALL(__NR_stat, sys_newstat)
-#define __NR_lstat			107
-__SYSCALL(__NR_lstat, sys_newlstat)
-#define __NR_fstat			108
-__SYSCALL(__NR_fstat, sys_newfstat)
 __SYSCALL(109, sys_ni_syscall)			/* 109 was sys_uname */
 __SYSCALL(110, sys_ni_syscall)			/* 110 was sys_iopl */
-#define __NR_vhangup			111
+__SYSCALL(111, sys_vhangup)
-__SYSCALL(__NR_vhangup, sys_vhangup)
 __SYSCALL(112, sys_ni_syscall)			/* 112 was sys_idle */
 __SYSCALL(113, sys_ni_syscall)			/* 113 was sys_syscall */
-#define __NR_wait4			114
+__SYSCALL(114, compat_sys_wait4)
-__SYSCALL(__NR_wait4, sys_wait4)
+__SYSCALL(115, sys_swapoff)
-#define __NR_swapoff			115
+__SYSCALL(116, compat_sys_sysinfo)
-__SYSCALL(__NR_swapoff, sys_swapoff)
-#define __NR_sysinfo			116
-__SYSCALL(__NR_sysinfo, sys_sysinfo)
 __SYSCALL(117, sys_ni_syscall)			/* 117 was sys_ipc */
-#define __NR_fsync			118
+__SYSCALL(118, sys_fsync)
-__SYSCALL(__NR_fsync, sys_fsync)
+__SYSCALL(119, compat_sys_sigreturn_wrapper)
-#define __NR_sigreturn			119
+__SYSCALL(120, compat_sys_clone_wrapper)
-__SYSCALL(__NR_sigreturn, sys_sigreturn)
+__SYSCALL(121, sys_setdomainname)
-#define __NR_clone			120
+__SYSCALL(122, sys_newuname)
-__SYSCALL(__NR_clone, sys_clone)
-#define __NR_setdomainname		121
-__SYSCALL(__NR_setdomainname, sys_setdomainname)
-#define __NR_uname			122
-__SYSCALL(__NR_uname, sys_newuname)
 __SYSCALL(123, sys_ni_syscall)			/* 123 was sys_modify_ldt */
-#define __NR_adjtimex			124
+__SYSCALL(124, compat_sys_adjtimex)
-__SYSCALL(__NR_adjtimex, sys_adjtimex)
+__SYSCALL(125, sys_mprotect)
-#define __NR_mprotect			125
+__SYSCALL(126, compat_sys_sigprocmask)
-__SYSCALL(__NR_mprotect, sys_mprotect)
-#define __NR_sigprocmask		126
-__SYSCALL(__NR_sigprocmask, sys_sigprocmask)
 __SYSCALL(127, sys_ni_syscall)			/* 127 was sys_create_module */
-#define __NR_init_module		128
+__SYSCALL(128, sys_init_module)
-__SYSCALL(__NR_init_module, sys_init_module)
+__SYSCALL(129, sys_delete_module)
-#define __NR_delete_module		129
-__SYSCALL(__NR_delete_module, sys_delete_module)
 __SYSCALL(130, sys_ni_syscall)			/* 130 was sys_get_kernel_syms */
-#define __NR_quotactl			131
+__SYSCALL(131, sys_quotactl)
-__SYSCALL(__NR_quotactl, sys_quotactl)
+__SYSCALL(132, sys_getpgid)
-#define __NR_getpgid			132
+__SYSCALL(133, sys_fchdir)
-__SYSCALL(__NR_getpgid, sys_getpgid)
+__SYSCALL(134, sys_bdflush)
-#define __NR_fchdir			133
+__SYSCALL(135, sys_sysfs)
-__SYSCALL(__NR_fchdir, sys_fchdir)
+__SYSCALL(136, sys_personality)
-#define __NR_bdflush			134
-__SYSCALL(__NR_bdflush, sys_bdflush)
-#define __NR_sysfs			135
-__SYSCALL(__NR_sysfs, sys_sysfs)
-#define __NR_personality		136
-__SYSCALL(__NR_personality, sys_personality)
 __SYSCALL(137, sys_ni_syscall)			/* 137 was sys_afs_syscall */
-#define __NR_setfsuid			138
+__SYSCALL(138, sys_setfsuid16)
-__SYSCALL(__NR_setfsuid, sys_setfsuid16)
+__SYSCALL(139, sys_setfsgid16)
-#define __NR_setfsgid			139
+__SYSCALL(140, sys_llseek)
-__SYSCALL(__NR_setfsgid, sys_setfsgid16)
+__SYSCALL(141, compat_sys_getdents)
-#define __NR__llseek			140
+__SYSCALL(142, compat_sys_select)
-__SYSCALL(__NR__llseek, sys_llseek)
+__SYSCALL(143, sys_flock)
-#define __NR_getdents			141
+__SYSCALL(144, sys_msync)
-__SYSCALL(__NR_getdents, sys_getdents)
+__SYSCALL(145, compat_sys_readv)
-#define __NR__newselect			142
+__SYSCALL(146, compat_sys_writev)
-__SYSCALL(__NR__newselect, sys_select)
+__SYSCALL(147, sys_getsid)
-#define __NR_flock			143
+__SYSCALL(148, sys_fdatasync)
-__SYSCALL(__NR_flock, sys_flock)
+__SYSCALL(149, compat_sys_sysctl)
-#define __NR_msync			144
+__SYSCALL(150, sys_mlock)
-__SYSCALL(__NR_msync, sys_msync)
+__SYSCALL(151, sys_munlock)
-#define __NR_readv			145
+__SYSCALL(152, sys_mlockall)
-__SYSCALL(__NR_readv, sys_readv)
+__SYSCALL(153, sys_munlockall)
-#define __NR_writev			146
+__SYSCALL(154, sys_sched_setparam)
-__SYSCALL(__NR_writev, sys_writev)
+__SYSCALL(155, sys_sched_getparam)
-#define __NR_getsid			147
+__SYSCALL(156, sys_sched_setscheduler)
-__SYSCALL(__NR_getsid, sys_getsid)
+__SYSCALL(157, sys_sched_getscheduler)
-#define __NR_fdatasync			148
+__SYSCALL(158, sys_sched_yield)
-__SYSCALL(__NR_fdatasync, sys_fdatasync)
+__SYSCALL(159, sys_sched_get_priority_max)
-#define __NR__sysctl			149
+__SYSCALL(160, sys_sched_get_priority_min)
-__SYSCALL(__NR__sysctl, sys_sysctl)
+__SYSCALL(161, compat_sys_sched_rr_get_interval)
-#define __NR_mlock			150
+__SYSCALL(162, compat_sys_nanosleep)
-__SYSCALL(__NR_mlock, sys_mlock)
+__SYSCALL(163, sys_mremap)
-#define __NR_munlock			151
+__SYSCALL(164, sys_setresuid16)
-__SYSCALL(__NR_munlock, sys_munlock)
+__SYSCALL(165, sys_getresuid16)
-#define __NR_mlockall			152
-__SYSCALL(__NR_mlockall, sys_mlockall)
-#define __NR_munlockall			153
-__SYSCALL(__NR_munlockall, sys_munlockall)
-#define __NR_sched_setparam		154
-__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
-#define __NR_sched_getparam		155
-__SYSCALL(__NR_sched_getparam, sys_sched_getparam)
-#define __NR_sched_setscheduler		156
-__SYSCALL(__NR_sched_setscheduler, sys_sched_setscheduler)
-#define __NR_sched_getscheduler		157
-__SYSCALL(__NR_sched_getscheduler, sys_sched_getscheduler)
-#define __NR_sched_yield		158
-__SYSCALL(__NR_sched_yield, sys_sched_yield)
-#define __NR_sched_get_priority_max	159
-__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
-#define __NR_sched_get_priority_min	160
-__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
-#define __NR_sched_rr_get_interval	161
-__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval)
-#define __NR_nanosleep			162
-__SYSCALL(__NR_nanosleep, sys_nanosleep)
-#define __NR_mremap			163
-__SYSCALL(__NR_mremap, sys_mremap)
-#define __NR_setresuid			164
-__SYSCALL(__NR_setresuid, sys_setresuid16)
-#define __NR_getresuid			165
-__SYSCALL(__NR_getresuid, sys_getresuid16)
 __SYSCALL(166, sys_ni_syscall)			/* 166 was sys_vm86 */
 __SYSCALL(167, sys_ni_syscall)			/* 167 was sys_query_module */
-#define __NR_poll			168
+__SYSCALL(168, sys_poll)
-__SYSCALL(__NR_poll, sys_poll)
+__SYSCALL(169, sys_ni_syscall)
-#define __NR_nfsservctl			169
+__SYSCALL(170, sys_setresgid16)
-__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
+__SYSCALL(171, sys_getresgid16)
-#define __NR_setresgid			170
+__SYSCALL(172, sys_prctl)
-__SYSCALL(__NR_setresgid, sys_setresgid16)
+__SYSCALL(173, compat_sys_rt_sigreturn_wrapper)
-#define __NR_getresgid			171
+__SYSCALL(174, compat_sys_rt_sigaction)
-__SYSCALL(__NR_getresgid, sys_getresgid16)
+__SYSCALL(175, compat_sys_rt_sigprocmask)
-#define __NR_prctl			172
+__SYSCALL(176, compat_sys_rt_sigpending)
-__SYSCALL(__NR_prctl, sys_prctl)
+__SYSCALL(177, compat_sys_rt_sigtimedwait)
-#define __NR_rt_sigreturn		173
+__SYSCALL(178, compat_sys_rt_sigqueueinfo)
-__SYSCALL(__NR_rt_sigreturn, sys_rt_sigreturn)
+__SYSCALL(179, compat_sys_rt_sigsuspend)
-#define __NR_rt_sigaction		174
+__SYSCALL(180, compat_sys_pread64_wrapper)
-__SYSCALL(__NR_rt_sigaction, sys_rt_sigaction)
+__SYSCALL(181, compat_sys_pwrite64_wrapper)
-#define __NR_rt_sigprocmask		175
+__SYSCALL(182, sys_chown16)
-__SYSCALL(__NR_rt_sigprocmask, sys_rt_sigprocmask)
+__SYSCALL(183, sys_getcwd)
-#define __NR_rt_sigpending		176
+__SYSCALL(184, sys_capget)
-__SYSCALL(__NR_rt_sigpending, sys_rt_sigpending)
+__SYSCALL(185, sys_capset)
-#define __NR_rt_sigtimedwait		177
+__SYSCALL(186, compat_sys_sigaltstack_wrapper)
-__SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait)
+__SYSCALL(187, compat_sys_sendfile)
-#define __NR_rt_sigqueueinfo		178
-__SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo)
-#define __NR_rt_sigsuspend		179
-__SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend)
-#define __NR_pread64			180
-__SYSCALL(__NR_pread64, sys_pread64)
-#define __NR_pwrite64			181
-__SYSCALL(__NR_pwrite64, sys_pwrite64)
-#define __NR_chown			182
-__SYSCALL(__NR_chown, sys_chown16)
-#define __NR_getcwd			183
-__SYSCALL(__NR_getcwd, sys_getcwd)
-#define __NR_capget			184
-__SYSCALL(__NR_capget, sys_capget)
-#define __NR_capset			185
-__SYSCALL(__NR_capset, sys_capset)
-#define __NR_sigaltstack		186
-__SYSCALL(__NR_sigaltstack, sys_sigaltstack)
-#define __NR_sendfile			187
-__SYSCALL(__NR_sendfile, sys_sendfile)
 __SYSCALL(188, sys_ni_syscall)			/* 188 reserved */
 __SYSCALL(189, sys_ni_syscall)			/* 189 reserved */
-#define __NR_vfork			190
+__SYSCALL(190, compat_sys_vfork_wrapper)
-__SYSCALL(__NR_vfork, sys_vfork)
+__SYSCALL(191, compat_sys_getrlimit)		/* SuS compliant getrlimit */
-#define __NR_ugetrlimit			191	/* SuS compliant getrlimit */
+__SYSCALL(192, sys_mmap_pgoff)
-__SYSCALL(__NR_ugetrlimit, sys_getrlimit)
+__SYSCALL(193, compat_sys_truncate64_wrapper)
-#define __NR_mmap2			192
+__SYSCALL(194, compat_sys_ftruncate64_wrapper)
-__SYSCALL(__NR_mmap2, sys_mmap2)
+__SYSCALL(195, sys_stat64)
-#define __NR_truncate64			193
+__SYSCALL(196, sys_lstat64)
-__SYSCALL(__NR_truncate64, sys_truncate64)
+__SYSCALL(197, sys_fstat64)
-#define __NR_ftruncate64		194
+__SYSCALL(198, sys_lchown)
-__SYSCALL(__NR_ftruncate64, sys_ftruncate64)
+__SYSCALL(199, sys_getuid)
-#define __NR_stat64			195
+__SYSCALL(200, sys_getgid)
-__SYSCALL(__NR_stat64, sys_stat64)
+__SYSCALL(201, sys_geteuid)
-#define __NR_lstat64			196
+__SYSCALL(202, sys_getegid)
-__SYSCALL(__NR_lstat64, sys_lstat64)
+__SYSCALL(203, sys_setreuid)
-#define __NR_fstat64			197
+__SYSCALL(204, sys_setregid)
-__SYSCALL(__NR_fstat64, sys_fstat64)
+__SYSCALL(205, sys_getgroups)
-#define __NR_lchown32			198
+__SYSCALL(206, sys_setgroups)
-__SYSCALL(__NR_lchown32, sys_lchown)
+__SYSCALL(207, sys_fchown)
-#define __NR_getuid32			199
+__SYSCALL(208, sys_setresuid)
-__SYSCALL(__NR_getuid32, sys_getuid)
+__SYSCALL(209, sys_getresuid)
-#define __NR_getgid32			200
+__SYSCALL(210, sys_setresgid)
-__SYSCALL(__NR_getgid32, sys_getgid)
+__SYSCALL(211, sys_getresgid)
-#define __NR_geteuid32			201
+__SYSCALL(212, sys_chown)
-__SYSCALL(__NR_geteuid32, sys_geteuid)
+__SYSCALL(213, sys_setuid)
-#define __NR_getegid32			202
+__SYSCALL(214, sys_setgid)
-__SYSCALL(__NR_getegid32, sys_getegid)
+__SYSCALL(215, sys_setfsuid)
-#define __NR_setreuid32			203
+__SYSCALL(216, sys_setfsgid)
-__SYSCALL(__NR_setreuid32, sys_setreuid)
+__SYSCALL(217, compat_sys_getdents64)
-#define __NR_setregid32			204
+__SYSCALL(218, sys_pivot_root)
-__SYSCALL(__NR_setregid32, sys_setregid)
+__SYSCALL(219, sys_mincore)
-#define __NR_getgroups32		205
+__SYSCALL(220, sys_madvise)
-__SYSCALL(__NR_getgroups32, sys_getgroups)
+__SYSCALL(221, compat_sys_fcntl64)
-#define __NR_setgroups32		206
-__SYSCALL(__NR_setgroups32, sys_setgroups)
-#define __NR_fchown32			207
-__SYSCALL(__NR_fchown32, sys_fchown)
-#define __NR_setresuid32		208
-__SYSCALL(__NR_setresuid32, sys_setresuid)
-#define __NR_getresuid32		209
-__SYSCALL(__NR_getresuid32, sys_getresuid)
-#define __NR_setresgid32		210
-__SYSCALL(__NR_setresgid32, sys_setresgid)
-#define __NR_getresgid32		211
-__SYSCALL(__NR_getresgid32, sys_getresgid)
-#define __NR_chown32			212
-__SYSCALL(__NR_chown32, sys_chown)
-#define __NR_setuid32			213
-__SYSCALL(__NR_setuid32, sys_setuid)
-#define __NR_setgid32			214
-__SYSCALL(__NR_setgid32, sys_setgid)
-#define __NR_setfsuid32			215
-__SYSCALL(__NR_setfsuid32, sys_setfsuid)
-#define __NR_setfsgid32			216
-__SYSCALL(__NR_setfsgid32, sys_setfsgid)
-#define __NR_getdents64			217
-__SYSCALL(__NR_getdents64, sys_getdents64)
-#define __NR_pivot_root			218
-__SYSCALL(__NR_pivot_root, sys_pivot_root)
-#define __NR_mincore			219
-__SYSCALL(__NR_mincore, sys_mincore)
-#define __NR_madvise			220
-__SYSCALL(__NR_madvise, sys_madvise)
-#define __NR_fcntl64			221
-__SYSCALL(__NR_fcntl64, sys_fcntl64)
 __SYSCALL(222, sys_ni_syscall)			/* 222 for tux */
 __SYSCALL(223, sys_ni_syscall)			/* 223 is unused */
-#define __NR_gettid			224
+__SYSCALL(224, sys_gettid)
-__SYSCALL(__NR_gettid, sys_gettid)
+__SYSCALL(225, compat_sys_readahead_wrapper)
-#define __NR_readahead			225
+__SYSCALL(226, sys_setxattr)
-__SYSCALL(__NR_readahead, sys_readahead)
+__SYSCALL(227, sys_lsetxattr)
-#define __NR_setxattr			226
+__SYSCALL(228, sys_fsetxattr)
-__SYSCALL(__NR_setxattr, sys_setxattr)
+__SYSCALL(229, sys_getxattr)
-#define __NR_lsetxattr			227
+__SYSCALL(230, sys_lgetxattr)
-__SYSCALL(__NR_lsetxattr, sys_lsetxattr)
+__SYSCALL(231, sys_fgetxattr)
-#define __NR_fsetxattr			228
+__SYSCALL(232, sys_listxattr)
-__SYSCALL(__NR_fsetxattr, sys_fsetxattr)
+__SYSCALL(233, sys_llistxattr)
-#define __NR_getxattr			229
+__SYSCALL(234, sys_flistxattr)
-__SYSCALL(__NR_getxattr, sys_getxattr)
+__SYSCALL(235, sys_removexattr)
-#define __NR_lgetxattr			230
+__SYSCALL(236, sys_lremovexattr)
-__SYSCALL(__NR_lgetxattr, sys_lgetxattr)
+__SYSCALL(237, sys_fremovexattr)
-#define __NR_fgetxattr			231
+__SYSCALL(238, sys_tkill)
-__SYSCALL(__NR_fgetxattr, sys_fgetxattr)
+__SYSCALL(239, sys_sendfile64)
-#define __NR_listxattr			232
+__SYSCALL(240, compat_sys_futex)
-__SYSCALL(__NR_listxattr, sys_listxattr)
+__SYSCALL(241, compat_sys_sched_setaffinity)
-#define __NR_llistxattr			233
+__SYSCALL(242, compat_sys_sched_getaffinity)
-__SYSCALL(__NR_llistxattr, sys_llistxattr)
+__SYSCALL(243, compat_sys_io_setup)
-#define __NR_flistxattr			234
+__SYSCALL(244, sys_io_destroy)
-__SYSCALL(__NR_flistxattr, sys_flistxattr)
+__SYSCALL(245, compat_sys_io_getevents)
-#define __NR_removexattr		235
+__SYSCALL(246, compat_sys_io_submit)
-__SYSCALL(__NR_removexattr, sys_removexattr)
+__SYSCALL(247, sys_io_cancel)
-#define __NR_lremovexattr		236
+__SYSCALL(248, sys_exit_group)
-__SYSCALL(__NR_lremovexattr, sys_lremovexattr)
+__SYSCALL(249, compat_sys_lookup_dcookie)
-#define __NR_fremovexattr		237
+__SYSCALL(250, sys_epoll_create)
-__SYSCALL(__NR_fremovexattr, sys_fremovexattr)
+__SYSCALL(251, sys_epoll_ctl)
-#define __NR_tkill			238
+__SYSCALL(252, sys_epoll_wait)
-__SYSCALL(__NR_tkill, sys_tkill)
+__SYSCALL(253, sys_remap_file_pages)
-#define __NR_sendfile64			239
-__SYSCALL(__NR_sendfile64, sys_sendfile64)
-#define __NR_futex			240
-__SYSCALL(__NR_futex, sys_futex)
-#define __NR_sched_setaffinity		241
-__SYSCALL(__NR_sched_setaffinity, sys_sched_setaffinity)
-#define __NR_sched_getaffinity		242
-__SYSCALL(__NR_sched_getaffinity, sys_sched_getaffinity)
-#define __NR_io_setup			243
-__SYSCALL(__NR_io_setup, sys_io_setup)
-#define __NR_io_destroy			244
-__SYSCALL(__NR_io_destroy, sys_io_destroy)
-#define __NR_io_getevents		245
-__SYSCALL(__NR_io_getevents, sys_io_getevents)
-#define __NR_io_submit			246
-__SYSCALL(__NR_io_submit, sys_io_submit)
-#define __NR_io_cancel			247
-__SYSCALL(__NR_io_cancel, sys_io_cancel)
-#define __NR_exit_group			248
-__SYSCALL(__NR_exit_group, sys_exit_group)
-#define __NR_lookup_dcookie		249
-__SYSCALL(__NR_lookup_dcookie, sys_lookup_dcookie)
-#define __NR_epoll_create		250
-__SYSCALL(__NR_epoll_create, sys_epoll_create)
-#define __NR_epoll_ctl			251
-__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)
-#define __NR_epoll_wait			252
-__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
-#define __NR_remap_file_pages		253
-__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)
 __SYSCALL(254, sys_ni_syscall)			/* 254 for set_thread_area */
 __SYSCALL(255, sys_ni_syscall)			/* 255 for get_thread_area */
-#define __NR_set_tid_address		256
+__SYSCALL(256, sys_set_tid_address)
-__SYSCALL(__NR_set_tid_address, sys_set_tid_address)
+__SYSCALL(257, compat_sys_timer_create)
-#define __NR_timer_create		257
+__SYSCALL(258, compat_sys_timer_settime)
-__SYSCALL(__NR_timer_create, sys_timer_create)
+__SYSCALL(259, compat_sys_timer_gettime)
-#define __NR_timer_settime		258
+__SYSCALL(260, sys_timer_getoverrun)
-__SYSCALL(__NR_timer_settime, sys_timer_settime)
+__SYSCALL(261, sys_timer_delete)
-#define __NR_timer_gettime		259
+__SYSCALL(262, compat_sys_clock_settime)
-__SYSCALL(__NR_timer_gettime, sys_timer_gettime)
+__SYSCALL(263, compat_sys_clock_gettime)
-#define __NR_timer_getoverrun		260
+__SYSCALL(264, compat_sys_clock_getres)
-__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
+__SYSCALL(265, compat_sys_clock_nanosleep)
-#define __NR_timer_delete		261
+__SYSCALL(266, compat_sys_statfs64_wrapper)
-__SYSCALL(__NR_timer_delete, sys_timer_delete)
+__SYSCALL(267, compat_sys_fstatfs64_wrapper)
-#define __NR_clock_settime		262
+__SYSCALL(268, sys_tgkill)
-__SYSCALL(__NR_clock_settime, sys_clock_settime)
+__SYSCALL(269, compat_sys_utimes)
-#define __NR_clock_gettime		263
+__SYSCALL(270, compat_sys_fadvise64_64_wrapper)
-__SYSCALL(__NR_clock_gettime, sys_clock_gettime)
+__SYSCALL(271, sys_pciconfig_iobase)
-#define __NR_clock_getres		264
+__SYSCALL(272, sys_pciconfig_read)
-__SYSCALL(__NR_clock_getres, sys_clock_getres)
+__SYSCALL(273, sys_pciconfig_write)
-#define __NR_clock_nanosleep		265
+__SYSCALL(274, compat_sys_mq_open)
-__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep)
+__SYSCALL(275, sys_mq_unlink)
-#define __NR_statfs64			266
+__SYSCALL(276, compat_sys_mq_timedsend)
-__SYSCALL(__NR_statfs64, sys_statfs64)
+__SYSCALL(277, compat_sys_mq_timedreceive)
-#define __NR_fstatfs64			267
+__SYSCALL(278, compat_sys_mq_notify)
-__SYSCALL(__NR_fstatfs64, sys_fstatfs64)
+__SYSCALL(279, compat_sys_mq_getsetattr)
-#define __NR_tgkill			268
+__SYSCALL(280, compat_sys_waitid)
-__SYSCALL(__NR_tgkill, sys_tgkill)
+__SYSCALL(281, sys_socket)
-#define __NR_utimes			269
+__SYSCALL(282, sys_bind)
-__SYSCALL(__NR_utimes, sys_utimes)
+__SYSCALL(283, sys_connect)
-#define __NR_fadvise64			270
+__SYSCALL(284, sys_listen)
-__SYSCALL(__NR_fadvise64, sys_fadvise64_64)
+__SYSCALL(285, sys_accept)
-#define __NR_pciconfig_iobase		271
+__SYSCALL(286, sys_getsockname)
-__SYSCALL(__NR_pciconfig_iobase, sys_pciconfig_iobase)
+__SYSCALL(287, sys_getpeername)
-#define __NR_pciconfig_read		272
+__SYSCALL(288, sys_socketpair)
-__SYSCALL(__NR_pciconfig_read, sys_pciconfig_read)
+__SYSCALL(289, sys_send)
-#define __NR_pciconfig_write		273
+__SYSCALL(290, sys_sendto)
-__SYSCALL(__NR_pciconfig_write, sys_pciconfig_write)
+__SYSCALL(291, compat_sys_recv)
-#define __NR_mq_open			274
+__SYSCALL(292, compat_sys_recvfrom)
-__SYSCALL(__NR_mq_open, sys_mq_open)
+__SYSCALL(293, sys_shutdown)
-#define __NR_mq_unlink			275
+__SYSCALL(294, compat_sys_setsockopt)
-__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
+__SYSCALL(295, compat_sys_getsockopt)
-#define __NR_mq_timedsend		276
+__SYSCALL(296, compat_sys_sendmsg)
-__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend)
+__SYSCALL(297, compat_sys_recvmsg)
-#define __NR_mq_timedreceive		277
+__SYSCALL(298, sys_semop)
-__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive)
+__SYSCALL(299, sys_semget)
-#define __NR_mq_notify			278
+__SYSCALL(300, compat_sys_semctl)
-__SYSCALL(__NR_mq_notify, sys_mq_notify)
+__SYSCALL(301, compat_sys_msgsnd)
-#define __NR_mq_getsetattr		279
+__SYSCALL(302, compat_sys_msgrcv)
-__SYSCALL(__NR_mq_getsetattr, sys_mq_getsetattr)
+__SYSCALL(303, sys_msgget)
-#define __NR_waitid			280
+__SYSCALL(304, compat_sys_msgctl)
-__SYSCALL(__NR_waitid, sys_waitid)
+__SYSCALL(305, compat_sys_shmat)
-#define __NR_socket			281
+__SYSCALL(306, sys_shmdt)
-__SYSCALL(__NR_socket, sys_socket)
+__SYSCALL(307, sys_shmget)
-#define __NR_bind			282
+__SYSCALL(308, compat_sys_shmctl)
-__SYSCALL(__NR_bind, sys_bind)
+__SYSCALL(309, sys_add_key)
-#define __NR_connect			283
+__SYSCALL(310, sys_request_key)
-__SYSCALL(__NR_connect, sys_connect)
+__SYSCALL(311, compat_sys_keyctl)
-#define __NR_listen			284
+__SYSCALL(312, compat_sys_semtimedop)
-__SYSCALL(__NR_listen, sys_listen)
+__SYSCALL(313, sys_ni_syscall)
-#define __NR_accept			285
+__SYSCALL(314, sys_ioprio_set)
-__SYSCALL(__NR_accept, sys_accept)
+__SYSCALL(315, sys_ioprio_get)
-#define __NR_getsockname		286
+__SYSCALL(316, sys_inotify_init)
-__SYSCALL(__NR_getsockname, sys_getsockname)
+__SYSCALL(317, sys_inotify_add_watch)
-#define __NR_getpeername		287
+__SYSCALL(318, sys_inotify_rm_watch)
-__SYSCALL(__NR_getpeername, sys_getpeername)
+__SYSCALL(319, compat_sys_mbind)
-#define __NR_socketpair			288
+__SYSCALL(320, compat_sys_get_mempolicy)
-__SYSCALL(__NR_socketpair, sys_socketpair)
+__SYSCALL(321, compat_sys_set_mempolicy)
-#define __NR_send			289
+__SYSCALL(322, compat_sys_openat)
-__SYSCALL(__NR_send, sys_send)
+__SYSCALL(323, sys_mkdirat)
-#define __NR_sendto			290
+__SYSCALL(324, sys_mknodat)
-__SYSCALL(__NR_sendto, sys_sendto)
+__SYSCALL(325, sys_fchownat)
-#define __NR_recv			291
+__SYSCALL(326, compat_sys_futimesat)
-__SYSCALL(__NR_recv, sys_recv)
+__SYSCALL(327, sys_fstatat64)
-#define __NR_recvfrom			292
+__SYSCALL(328, sys_unlinkat)
-__SYSCALL(__NR_recvfrom, sys_recvfrom)
+__SYSCALL(329, sys_renameat)
-#define __NR_shutdown			293
+__SYSCALL(330, sys_linkat)
-__SYSCALL(__NR_shutdown, sys_shutdown)
+__SYSCALL(331, sys_symlinkat)
-#define __NR_setsockopt			294
+__SYSCALL(332, sys_readlinkat)
-__SYSCALL(__NR_setsockopt, sys_setsockopt)
+__SYSCALL(333, sys_fchmodat)
-#define __NR_getsockopt			295
+__SYSCALL(334, sys_faccessat)
-__SYSCALL(__NR_getsockopt, sys_getsockopt)
+__SYSCALL(335, compat_sys_pselect6)
-#define __NR_sendmsg			296
+__SYSCALL(336, compat_sys_ppoll)
-__SYSCALL(__NR_sendmsg, sys_sendmsg)
+__SYSCALL(337, sys_unshare)
-#define __NR_recvmsg			297
+__SYSCALL(338, compat_sys_set_robust_list)
-__SYSCALL(__NR_recvmsg, sys_recvmsg)
+__SYSCALL(339, compat_sys_get_robust_list)
-#define __NR_semop			298
+__SYSCALL(340, sys_splice)
-__SYSCALL(__NR_semop, sys_semop)
+__SYSCALL(341, compat_sys_sync_file_range2_wrapper)
-#define __NR_semget			299
+__SYSCALL(342, sys_tee)
-__SYSCALL(__NR_semget, sys_semget)
+__SYSCALL(343, compat_sys_vmsplice)
-#define __NR_semctl			300
+__SYSCALL(344, compat_sys_move_pages)
-__SYSCALL(__NR_semctl, sys_semctl)
+__SYSCALL(345, sys_getcpu)
-#define __NR_msgsnd			301
+__SYSCALL(346, compat_sys_epoll_pwait)
-__SYSCALL(__NR_msgsnd, sys_msgsnd)
+__SYSCALL(347, compat_sys_kexec_load)
-#define __NR_msgrcv			302
+__SYSCALL(348, compat_sys_utimensat)
-__SYSCALL(__NR_msgrcv, sys_msgrcv)
+__SYSCALL(349, compat_sys_signalfd)
-#define __NR_msgget			303
+__SYSCALL(350, sys_timerfd_create)
-__SYSCALL(__NR_msgget, sys_msgget)
+__SYSCALL(351, sys_eventfd)
-#define __NR_msgctl			304
+__SYSCALL(352, compat_sys_fallocate_wrapper)
-__SYSCALL(__NR_msgctl, sys_msgctl)
+__SYSCALL(353, compat_sys_timerfd_settime)
-#define __NR_shmat			305
+__SYSCALL(354, compat_sys_timerfd_gettime)
-__SYSCALL(__NR_shmat, sys_shmat)
+__SYSCALL(355, compat_sys_signalfd4)
-#define __NR_shmdt			306
+__SYSCALL(356, sys_eventfd2)
-__SYSCALL(__NR_shmdt, sys_shmdt)
+__SYSCALL(357, sys_epoll_create1)
-#define __NR_shmget			307
+__SYSCALL(358, sys_dup3)
-__SYSCALL(__NR_shmget, sys_shmget)
+__SYSCALL(359, sys_pipe2)
-#define __NR_shmctl			308
+__SYSCALL(360, sys_inotify_init1)
-__SYSCALL(__NR_shmctl, sys_shmctl)
+__SYSCALL(361, compat_sys_preadv)
-#define __NR_add_key			309
+__SYSCALL(362, compat_sys_pwritev)
-__SYSCALL(__NR_add_key, sys_add_key)
+__SYSCALL(363, compat_sys_rt_tgsigqueueinfo)
-#define __NR_request_key		310
+__SYSCALL(364, sys_perf_event_open)
-__SYSCALL(__NR_request_key, sys_request_key)
+__SYSCALL(365, compat_sys_recvmmsg)
-#define __NR_keyctl			311
+__SYSCALL(366, sys_accept4)
-__SYSCALL(__NR_keyctl, sys_keyctl)
+__SYSCALL(367, sys_fanotify_init)
-#define __NR_semtimedop			312
+__SYSCALL(368, compat_sys_fanotify_mark_wrapper)
-__SYSCALL(__NR_semtimedop, sys_semtimedop)
+__SYSCALL(369, sys_prlimit64)
-#define __NR_vserver			313
+__SYSCALL(370, sys_name_to_handle_at)
-__SYSCALL(__NR_vserver, sys_ni_syscall)
+__SYSCALL(371, sys_open_by_handle_at)
-#define __NR_ioprio_set			314
+__SYSCALL(372, sys_clock_adjtime)
-__SYSCALL(__NR_ioprio_set, sys_ioprio_set)
+__SYSCALL(373, sys_syncfs)
-#define __NR_ioprio_get			315
-__SYSCALL(__NR_ioprio_get, sys_ioprio_get)
+#define __NR_compat_syscalls		374
-#define __NR_inotify_init		316
-__SYSCALL(__NR_inotify_init, sys_inotify_init)
+/*
-#define __NR_inotify_add_watch		317
+ * Compat syscall numbers used by the AArch64 kernel.
-__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
+ */
-#define __NR_inotify_rm_watch		318
+#define __NR_compat_restart_syscall	0
-__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
+#define __NR_compat_sigreturn		119
-#define __NR_mbind			319
+#define __NR_compat_rt_sigreturn	173
-__SYSCALL(__NR_mbind, sys_mbind)
-#define __NR_get_mempolicy		320
-__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
-#define __NR_set_mempolicy		321
-__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
-#define __NR_openat			322
-__SYSCALL(__NR_openat, sys_openat)
-#define __NR_mkdirat			323
-__SYSCALL(__NR_mkdirat, sys_mkdirat)
-#define __NR_mknodat			324
-__SYSCALL(__NR_mknodat, sys_mknodat)
-#define __NR_fchownat			325
-__SYSCALL(__NR_fchownat, sys_fchownat)
-#define __NR_futimesat			326
-__SYSCALL(__NR_futimesat, sys_futimesat)
-#define __NR_fstatat64			327
-__SYSCALL(__NR_fstatat64, sys_fstatat64)
-#define __NR_unlinkat			328
-__SYSCALL(__NR_unlinkat, sys_unlinkat)
-#define __NR_renameat			329
-__SYSCALL(__NR_renameat, sys_renameat)
-#define __NR_linkat			330
-__SYSCALL(__NR_linkat, sys_linkat)
-#define __NR_symlinkat			331
-__SYSCALL(__NR_symlinkat, sys_symlinkat)
-#define __NR_readlinkat			332
-__SYSCALL(__NR_readlinkat, sys_readlinkat)
-#define __NR_fchmodat			333
-__SYSCALL(__NR_fchmodat, sys_fchmodat)
-#define __NR_faccessat			334
-__SYSCALL(__NR_faccessat, sys_faccessat)
-#define __NR_pselect6			335
-__SYSCALL(__NR_pselect6, sys_pselect6)
-#define __NR_ppoll			336
-__SYSCALL(__NR_ppoll, sys_ppoll)
-#define __NR_unshare			337
-__SYSCALL(__NR_unshare, sys_unshare)
-#define __NR_set_robust_list		338
-__SYSCALL(__NR_set_robust_list, sys_set_robust_list)
-#define __NR_get_robust_list		339
-__SYSCALL(__NR_get_robust_list, sys_get_robust_list)
-#define __NR_splice			340
-__SYSCALL(__NR_splice, sys_splice)
-#define __NR_sync_file_range2		341
-__SYSCALL(__NR_sync_file_range2, sys_sync_file_range2)
-#define __NR_tee			342
-__SYSCALL(__NR_tee, sys_tee)
-#define __NR_vmsplice			343
-__SYSCALL(__NR_vmsplice, sys_vmsplice)
-#define __NR_move_pages			344
-__SYSCALL(__NR_move_pages, sys_move_pages)
-#define __NR_getcpu			345
-__SYSCALL(__NR_getcpu, sys_getcpu)
-#define __NR_epoll_pwait		346
-__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)
-#define __NR_kexec_load			347
-__SYSCALL(__NR_kexec_load, sys_kexec_load)
-#define __NR_utimensat			348
-__SYSCALL(__NR_utimensat, sys_utimensat)
-#define __NR_signalfd			349
-__SYSCALL(__NR_signalfd, sys_signalfd)
-#define __NR_timerfd_create		350
-__SYSCALL(__NR_timerfd_create, sys_timerfd_create)
-#define __NR_eventfd			351
-__SYSCALL(__NR_eventfd, sys_eventfd)
-#define __NR_fallocate			352
-__SYSCALL(__NR_fallocate, sys_fallocate)
-#define __NR_timerfd_settime		353
-__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)
-#define __NR_timerfd_gettime		354
-__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)
-#define __NR_signalfd4			355
-__SYSCALL(__NR_signalfd4, sys_signalfd4)
-#define __NR_eventfd2			356
-__SYSCALL(__NR_eventfd2, sys_eventfd2)
-#define __NR_epoll_create1		357
-__SYSCALL(__NR_epoll_create1, sys_epoll_create1)
-#define __NR_dup3			358
-__SYSCALL(__NR_dup3, sys_dup3)
-#define __NR_pipe2			359
-__SYSCALL(__NR_pipe2, sys_pipe2)
-#define __NR_inotify_init1		360
-__SYSCALL(__NR_inotify_init1, sys_inotify_init1)
-#define __NR_preadv			361
-__SYSCALL(__NR_preadv, sys_preadv)
-#define __NR_pwritev			362
-__SYSCALL(__NR_pwritev, sys_pwritev)
-#define __NR_rt_tgsigqueueinfo		363
-__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_event_open		364
-__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
-#define __NR_recvmmsg			365
-__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
-#define __NR_accept4			366
-__SYSCALL(__NR_accept4, sys_accept4)
-#define __NR_fanotify_init		367
-__SYSCALL(__NR_fanotify_init, sys_fanotify_init)
-#define __NR_fanotify_mark		368
-__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)
-#define __NR_prlimit64			369
-__SYSCALL(__NR_prlimit64, sys_prlimit64)
-#define __NR_name_to_handle_at		370
-__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
-#define __NR_open_by_handle_at		371
-__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
-#define __NR_clock_adjtime		372
-__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
-#define __NR_syncfs			373
-__SYSCALL(__NR_syncfs, sys_syncfs)
 /*
 * The following SVCs are ARM private.
@@ -737,19 +412,3 @@ __SYSCALL(__NR_syncfs, sys_syncfs)
 #define __ARM_NR_COMPAT_BASE		0x0f0000
 #define __ARM_NR_compat_cacheflush	(__ARM_NR_COMPAT_BASE+2)
 #define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE+5)
-#endif	/* __SYSCALL_COMPAT */
-#define __NR_compat_syscalls		374
-#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION
-#define __ARCH_WANT_COMPAT_STAT64
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_GETPGRP
-#define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
-#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
-#define __ARCH_WANT_COMPAT_SYS_SENDFILE
--- a/arch/arm64/include/uapi/asm/Kbuild
+++ b/arch/arm64/include/uapi/asm/Kbuild
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
+header-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += fcntl.h
+header-y += hwcap.h
+header-y += param.h
+header-y += ptrace.h
+header-y += setup.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += stat.h
+header-y += statfs.h
+header-y += unistd.h
--- a/arch/arm64/include/asm/auxvec.h
+++ b/arch/arm64/include/asm/auxvec.h
--- a/arch/arm64/include/asm/bitsperlong.h
+++ b/arch/arm64/include/asm/bitsperlong.h
--- a/arch/arm64/include/asm/byteorder.h
+++ b/arch/arm64/include/asm/byteorder.h
--- a/arch/arm64/include/asm/fcntl.h
+++ b/arch/arm64/include/asm/fcntl.h
--- a/arch/arm64/include/uapi/asm/hwcap.h
+++ b/arch/arm64/include/uapi/asm/hwcap.h
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_HWCAP_H
+#define _UAPI__ASM_HWCAP_H
+/*
+ * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
+ */
+#define HWCAP_FP		(1 << 0)
+#define HWCAP_ASIMD		(1 << 1)
+#endif /* _UAPI__ASM_HWCAP_H */
--- a/arch/arm64/include/asm/param.h
+++ b/arch/arm64/include/asm/param.h
--- a/arch/arm64/include/uapi/asm/ptrace.h
+++ b/arch/arm64/include/uapi/asm/ptrace.h
+/*
+ * Based on arch/arm/include/asm/ptrace.h
+ *
+ * Copyright (C) 1996-2003 Russell King
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_PTRACE_H
+#define _UAPI__ASM_PTRACE_H
+#include <linux/types.h>
+#include <asm/hwcap.h>
+/*
+ * PSR bits
+ */
+#define PSR_MODE_EL0t	0x00000000
+#define PSR_MODE_EL1t	0x00000004
+#define PSR_MODE_EL1h	0x00000005
+#define PSR_MODE_EL2t	0x00000008
+#define PSR_MODE_EL2h	0x00000009
+#define PSR_MODE_EL3t	0x0000000c
+#define PSR_MODE_EL3h	0x0000000d
+#define PSR_MODE_MASK	0x0000000f
+/* AArch32 CPSR bits */
+#define PSR_MODE32_BIT		0x00000010
+/* AArch64 SPSR bits */
+#define PSR_F_BIT	0x00000040
+#define PSR_I_BIT	0x00000080
+#define PSR_A_BIT	0x00000100
+#define PSR_D_BIT	0x00000200
+#define PSR_Q_BIT	0x08000000
+#define PSR_V_BIT	0x10000000
+#define PSR_C_BIT	0x20000000
+#define PSR_Z_BIT	0x40000000
+#define PSR_N_BIT	0x80000000
+/*
+ * Groups of PSR bits
+ */
+#define PSR_f		0xff000000	/* Flags		*/
+#define PSR_s		0x00ff0000	/* Status		*/
+#define PSR_x		0x0000ff00	/* Extension		*/
+#define PSR_c		0x000000ff	/* Control		*/
+#ifndef __ASSEMBLY__
+/*
+ * User structures for general purpose, floating point and debug registers.
+ */
+struct user_pt_regs {
+	__u64		regs[31];
+	__u64		sp;
+	__u64		pc;
+	__u64		pstate;
+};
+struct user_fpsimd_state {
+	__uint128_t	vregs[32];
+	__u32		fpsr;
+	__u32		fpcr;
+};
+struct user_hwdebug_state {
+	__u32		dbg_info;
+	struct {
+		__u64	addr;
+		__u32	ctrl;
+	}		dbg_regs[16];
+};
+#endif /* __ASSEMBLY__ */
+#endif /* _UAPI__ASM_PTRACE_H */
--- a/arch/arm64/include/asm/setup.h
+++ b/arch/arm64/include/asm/setup.h
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef _UAPI__ASM_SIGCONTEXT_H
+#define _UAPI__ASM_SIGCONTEXT_H
+#include <linux/types.h>
+/*
+ * Signal context structure - contains all info to do with the state
+ * before the signal handler was invoked.
+ */
+struct sigcontext {
+	__u64 fault_address;
+	/* AArch64 registers */
+	__u64 regs[31];
+	__u64 sp;
+	__u64 pc;
+	__u64 pstate;
+	/* 4K reserved for FP/SIMD state and future expansion */
+	__u8 __reserved[4096] __attribute__((__aligned__(16)));
+};
+/*
+ * Header to be used at the beginning of structures extending the user
+ * context. Such structures must be placed after the rt_sigframe on the stack
+ * and be 16-byte aligned. The last structure must be a dummy one with the
+ * magic and size set to 0.
+ */
+struct _aarch64_ctx {
+	__u32 magic;
+	__u32 size;
+};
+#define FPSIMD_MAGIC	0x46508001
+struct fpsimd_context {
+	struct _aarch64_ctx head;
+	__u32 fpsr;
+	__u32 fpcr;
+	__uint128_t vregs[32];
+};
+#endif /* _UAPI__ASM_SIGCONTEXT_H */
--- a/arch/arm64/include/asm/siginfo.h
+++ b/arch/arm64/include/asm/siginfo.h
--- a/arch/arm64/include/asm/signal.h
+++ b/arch/arm64/include/asm/signal.h
--- a/arch/arm64/include/uapi/asm/stat.h
+++ b/arch/arm64/include/uapi/asm/stat.h
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <asm-generic/stat.h>
--- a/arch/arm64/include/asm/statfs.h
+++ b/arch/arm64/include/asm/statfs.h
--- a/arch/arm64/include/uapi/asm/unistd.h
+++ b/arch/arm64/include/uapi/asm/unistd.h
+/*
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <asm-generic/unistd.h>
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -26,6 +26,7 @@
 #include <asm/errno.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
+#include <asm/unistd32.h>
 /*
 * Bad Abort numbers

--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -823,11 +823,11 @@ static int compat_ptrace_read_user(struct task_struct *tsk, compat_ulong_t off,
 	if (off & 3)
 		return -EIO;
-	if (off == PT_TEXT_ADDR)
+	if (off == COMPAT_PT_TEXT_ADDR)
 		tmp = tsk->mm->start_code;
-	else if (off == PT_DATA_ADDR)
+	else if (off == COMPAT_PT_DATA_ADDR)
 		tmp = tsk->mm->start_data;
-	else if (off == PT_TEXT_END_ADDR)
+	else if (off == COMPAT_PT_TEXT_END_ADDR)
 		tmp = tsk->mm->end_code;
 	else if (off < sizeof(compat_elf_gregset_t))
 		return copy_regset_to_user(tsk, &user_aarch32_view,

--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define __SYSCALL_COMPAT
 #include <linux/compat.h>
 #include <linux/signal.h>
 #include <linux/syscalls.h>
@@ -28,7 +26,7 @@
 #include <asm/fpsimd.h>
 #include <asm/signal32.h>
 #include <asm/uaccess.h>
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
 struct compat_sigaction {
 	compat_uptr_t			sa_handler;
@@ -126,19 +124,19 @@ struct compat_rt_sigframe {
 * For ARM syscalls, the syscall number has to be loaded into r7.
 * We do not support an OABI userspace.
 */
-#define MOV_R7_NR_SIGRETURN	(0xe3a07000 | __NR_sigreturn)
+#define MOV_R7_NR_SIGRETURN	(0xe3a07000 | __NR_compat_sigreturn)
-#define SVC_SYS_SIGRETURN	(0xef000000 | __NR_sigreturn)
+#define SVC_SYS_SIGRETURN	(0xef000000 | __NR_compat_sigreturn)
-#define MOV_R7_NR_RT_SIGRETURN	(0xe3a07000 | __NR_rt_sigreturn)
+#define MOV_R7_NR_RT_SIGRETURN	(0xe3a07000 | __NR_compat_rt_sigreturn)
-#define SVC_SYS_RT_SIGRETURN	(0xef000000 | __NR_rt_sigreturn)
+#define SVC_SYS_RT_SIGRETURN	(0xef000000 | __NR_compat_rt_sigreturn)
 /*
 * For Thumb syscalls, we also pass the syscall number via r7. We therefore
 * need two 16-bit instructions.
 */
-#define SVC_THUMB_SIGRETURN	(((0xdf00 | __NR_sigreturn) << 16) | \
+#define SVC_THUMB_SIGRETURN	(((0xdf00 | __NR_compat_sigreturn) << 16) | \
-				   0x2700 | __NR_sigreturn)
+				   0x2700 | __NR_compat_sigreturn)
-#define SVC_THUMB_RT_SIGRETURN	(((0xdf00 | __NR_rt_sigreturn) << 16) | \
+#define SVC_THUMB_RT_SIGRETURN	(((0xdf00 | __NR_compat_rt_sigreturn) << 16) | \
-				   0x2700 | __NR_rt_sigreturn)
+				   0x2700 | __NR_compat_rt_sigreturn)
 const compat_ulong_t aarch32_sigret_code[6] = {
 	/*
@@ -819,5 +817,5 @@ asmlinkage int compat_sys_rt_sigqueueinfo(int pid, int sig,
 void compat_setup_restart_syscall(struct pt_regs *regs)
 {
-       regs->regs[7] = __NR_restart_syscall;
+       regs->regs[7] = __NR_compat_restart_syscall;
 }
--- a/arch/arm64/kernel/sys32.S
+++ b/arch/arm64/kernel/sys32.S
@@ -147,136 +147,12 @@ compat_sys_fanotify_mark_wrapper:
 	b	sys_fanotify_mark
 ENDPROC(compat_sys_fanotify_mark_wrapper)
-/*
- * Use the compat system call wrappers.
- */
-#define sys_fork		compat_sys_fork_wrapper
-#define sys_open		compat_sys_open
-#define sys_execve		compat_sys_execve_wrapper
-#define sys_lseek		compat_sys_lseek_wrapper
-#define sys_mount		compat_sys_mount
-#define sys_ptrace		compat_sys_ptrace
-#define sys_times		compat_sys_times
-#define sys_ioctl		compat_sys_ioctl
-#define sys_fcntl		compat_sys_fcntl
-#define sys_ustat		compat_sys_ustat
-#define sys_sigaction		compat_sys_sigaction
-#define sys_sigsuspend		compat_sys_sigsuspend
-#define sys_sigpending		compat_sys_sigpending
-#define sys_setrlimit		compat_sys_setrlimit
-#define sys_getrusage		compat_sys_getrusage
-#define sys_gettimeofday	compat_sys_gettimeofday
-#define sys_settimeofday	compat_sys_settimeofday
-#define sys_statfs		compat_sys_statfs
-#define sys_fstatfs		compat_sys_fstatfs
-#define sys_setitimer		compat_sys_setitimer
-#define sys_getitimer		compat_sys_getitimer
-#define sys_newstat		compat_sys_newstat
-#define sys_newlstat		compat_sys_newlstat
-#define sys_newfstat		compat_sys_newfstat
-#define sys_wait4		compat_sys_wait4
-#define sys_sysinfo		compat_sys_sysinfo
-#define sys_sigreturn		compat_sys_sigreturn_wrapper
-#define sys_clone		compat_sys_clone_wrapper
-#define sys_adjtimex		compat_sys_adjtimex
-#define sys_sigprocmask		compat_sys_sigprocmask
-#define sys_getdents		compat_sys_getdents
-#define sys_select		compat_sys_select
-#define sys_readv		compat_sys_readv
-#define sys_writev		compat_sys_writev
-#define sys_sysctl		compat_sys_sysctl
-#define sys_sched_rr_get_interval compat_sys_sched_rr_get_interval
-#define sys_nanosleep		compat_sys_nanosleep
-#define sys_rt_sigreturn	compat_sys_rt_sigreturn_wrapper
-#define sys_rt_sigaction	compat_sys_rt_sigaction
-#define sys_rt_sigprocmask	compat_sys_rt_sigprocmask
-#define sys_rt_sigpending	compat_sys_rt_sigpending
-#define sys_rt_sigtimedwait	compat_sys_rt_sigtimedwait
-#define sys_rt_sigqueueinfo	compat_sys_rt_sigqueueinfo
-#define sys_rt_sigsuspend	compat_sys_rt_sigsuspend
-#define sys_pread64		compat_sys_pread64_wrapper
-#define sys_pwrite64		compat_sys_pwrite64_wrapper
-#define sys_sigaltstack		compat_sys_sigaltstack_wrapper
-#define sys_sendfile		compat_sys_sendfile
-#define sys_vfork		compat_sys_vfork_wrapper
-#define sys_getrlimit		compat_sys_getrlimit
-#define sys_mmap2		sys_mmap_pgoff
-#define sys_truncate64		compat_sys_truncate64_wrapper
-#define sys_ftruncate64		compat_sys_ftruncate64_wrapper
-#define sys_getdents64		compat_sys_getdents64
-#define sys_fcntl64		compat_sys_fcntl64
-#define sys_readahead		compat_sys_readahead_wrapper
-#define sys_futex		compat_sys_futex
-#define sys_sched_setaffinity	compat_sys_sched_setaffinity
-#define sys_sched_getaffinity	compat_sys_sched_getaffinity
-#define sys_io_setup		compat_sys_io_setup
-#define sys_io_getevents	compat_sys_io_getevents
-#define sys_io_submit		compat_sys_io_submit
-#define sys_lookup_dcookie	compat_sys_lookup_dcookie
-#define sys_timer_create	compat_sys_timer_create
-#define sys_timer_settime	compat_sys_timer_settime
-#define sys_timer_gettime	compat_sys_timer_gettime
-#define sys_clock_settime	compat_sys_clock_settime
-#define sys_clock_gettime	compat_sys_clock_gettime
-#define sys_clock_getres	compat_sys_clock_getres
-#define sys_clock_nanosleep	compat_sys_clock_nanosleep
-#define sys_statfs64		compat_sys_statfs64_wrapper
-#define sys_fstatfs64		compat_sys_fstatfs64_wrapper
-#define sys_utimes		compat_sys_utimes
-#define sys_fadvise64_64	compat_sys_fadvise64_64_wrapper
-#define sys_mq_open		compat_sys_mq_open
-#define sys_mq_timedsend	compat_sys_mq_timedsend
-#define sys_mq_timedreceive	compat_sys_mq_timedreceive
-#define sys_mq_notify		compat_sys_mq_notify
-#define sys_mq_getsetattr	compat_sys_mq_getsetattr
-#define sys_waitid		compat_sys_waitid
-#define sys_recv		compat_sys_recv
-#define sys_recvfrom		compat_sys_recvfrom
-#define sys_setsockopt		compat_sys_setsockopt
-#define sys_getsockopt		compat_sys_getsockopt
-#define sys_sendmsg		compat_sys_sendmsg
-#define sys_recvmsg		compat_sys_recvmsg
-#define sys_semctl		compat_sys_semctl
-#define sys_msgsnd		compat_sys_msgsnd
-#define sys_msgrcv		compat_sys_msgrcv
-#define sys_msgctl		compat_sys_msgctl
-#define sys_shmat		compat_sys_shmat
-#define sys_shmctl		compat_sys_shmctl
-#define sys_keyctl		compat_sys_keyctl
-#define sys_semtimedop		compat_sys_semtimedop
-#define sys_mbind		compat_sys_mbind
-#define sys_get_mempolicy	compat_sys_get_mempolicy
-#define sys_set_mempolicy	compat_sys_set_mempolicy
-#define sys_openat		compat_sys_openat
-#define sys_futimesat		compat_sys_futimesat
-#define sys_pselect6		compat_sys_pselect6
-#define sys_ppoll		compat_sys_ppoll
-#define sys_set_robust_list	compat_sys_set_robust_list
-#define sys_get_robust_list	compat_sys_get_robust_list
-#define sys_sync_file_range2	compat_sys_sync_file_range2_wrapper
-#define sys_vmsplice		compat_sys_vmsplice
-#define sys_move_pages		compat_sys_move_pages
-#define sys_epoll_pwait		compat_sys_epoll_pwait
-#define sys_kexec_load		compat_sys_kexec_load
-#define sys_utimensat		compat_sys_utimensat
-#define sys_signalfd		compat_sys_signalfd
-#define sys_fallocate		compat_sys_fallocate_wrapper
-#define sys_timerfd_settime	compat_sys_timerfd_settime
-#define sys_timerfd_gettime	compat_sys_timerfd_gettime
-#define sys_signalfd4		compat_sys_signalfd4
-#define sys_preadv		compat_sys_preadv
-#define sys_pwritev		compat_sys_pwritev
-#define sys_rt_tgsigqueueinfo	compat_sys_rt_tgsigqueueinfo
-#define sys_recvmmsg		compat_sys_recvmmsg
-#define sys_fanotify_mark	compat_sys_fanotify_mark_wrapper
 #undef __SYSCALL
 #define __SYSCALL(x, y)		.quad	y	// x
-#define __SYSCALL_COMPAT
 /*
 * The system calls table must be 4KB aligned.
 */
 	.align	12
 ENTRY(compat_sys_call_table)
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define __SYSCALL_COMPAT
 #include <linux/compat.h>
 #include <linux/personality.h>
 #include <linux/sched.h>
@@ -28,7 +26,7 @@
 #include <linux/uaccess.h>
 #include <asm/cacheflush.h>
-#include <asm/unistd.h>
+#include <asm/unistd32.h>
 asmlinkage int compat_sys_fork(struct pt_regs *regs)
 {