diff options
| author | Ingo Molnar | 2015-03-04 06:35:43 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2015-03-04 06:35:43 +0100 |
| commit | d2c032e3dc58137a7261a7824d3acce435db1d66 (patch) | |
| tree | 7eea1c7c6103eefe879f07472eec99b3c41eb792 /arch/arm64/kernel/sys.c | |
| parent | x86/compat: Remove sys32_vm86_warning (diff) | |
| parent | Linux 4.0-rc2 (diff) | |
| download | kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.gz kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.tar.xz kernel-qcow2-linux-d2c032e3dc58137a7261a7824d3acce435db1d66.zip | |
Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/sys.c')
| -rw-r--r-- | arch/arm64/kernel/sys.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 3fa98ff14f0e..75151aaf1a52 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -39,10 +39,9 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, /* * Wrappers to pass the pt_regs argument. */ +asmlinkage long sys_rt_sigreturn_wrapper(void); #define sys_rt_sigreturn sys_rt_sigreturn_wrapper -#include <asm/syscalls.h> - #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, @@ -50,7 +49,7 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, * The sys_call_table array must be 4K aligned to be accessible from * kernel/entry.S. */ -void *sys_call_table[__NR_syscalls] __aligned(4096) = { +void * const sys_call_table[__NR_syscalls] __aligned(4096) = { [0 ... __NR_syscalls - 1] = sys_ni_syscall, #include <asm/unistd.h> }; |