diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-08 16:33:38 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-03-12 19:25:26 +0300 |
| commit | 9b4db147ac19c2320edec431d93193f42e32d425 (patch) | |
| tree | 5c375ee54992a40312e3172c57b660ea3d70e94d | |
| parent | affec13bd171a5d15389392fb90f98f0d0ec89b3 (diff) | |
ARM64:ILP32: work around the compilation error due to mainline changestracking-ilp32-ll-20150912.0tracking-ilp32-ll-20150911.0tracking-ilp32-ll-20150909.0tracking-ilp32-ll-20150902.0tracking-ilp32-ll-20150901.0tracking-ilp32-ll-20150828.0tracking-ilp32-ll-20150818.0tracking-ilp32-ll-20150812.0tracking-ilp32-ll-20150804.0tracking-ilp32-ll-20150724.1tracking-ilp32-ll-20150724.0tracking-ilp32-ll-20150721.0tracking-ilp32-ll-20150714.0tracking-ilp32-ll-20150709.0tracking-ilp32-ll-20150629.0tracking-ilp32-ll-20150619.0tracking-ilp32-ll-20150616.0tracking-ilp32-ll-20150611.0tracking-ilp32-ll-20150610.0tracking-ilp32-ll-20150601.0tracking-ilp32-ll-20150519.0tracking-ilp32-ll-20150515.0tracking-ilp32-ll-20150514.0tracking-ilp32-ll-20150507.0tracking-ilp32-ll-20150430.0tracking-ilp32-ll-20150422.0tracking-ilp32-ll-20150421.0tracking-ilp32-ll-20150416.0tracking-ilp32-ll-20150414.0tracking-ilp32-ll-20150331.0tracking-ilp32-ll-20150319.0tracking-ilp32-ll-20150317.0tracking-ilp32-ll-20150312.0
Commit 9648606 "arm64: Remove asm/syscalls.h" removed the header file
which the patch "ARM64:ILP32: Fix signal return for ILP32 when the user
modified the signal stack" was using.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | arch/arm64/kernel/signal.c | 7 | ||||
| -rw-r--r-- | arch/arm64/kernel/sys_ilp32.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index ab0a2a18fc6d..a6b6a4079f84 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -35,7 +35,6 @@ #include <asm/fpsimd.h> #include <asm/signal32.h> #include <asm/vdso.h> -#include <asm/syscalls.h> /* * Do a signal return; undo the signal stack. These are aligned to 128-bit. @@ -128,6 +127,12 @@ static int restore_sigframe(struct pt_regs *regs, return err; } +#ifdef CONFIG_ARM64_ILP32 +extern long ilp32_sys_sigaltstack(const stack_t __user *uss_ptr, + stack_t __user *uoss_ptr); +#endif + + asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) { struct rt_sigframe __user *frame; diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c index a976bcea84d7..35d5ab570cdc 100644 --- a/arch/arm64/kernel/sys_ilp32.c +++ b/arch/arm64/kernel/sys_ilp32.c @@ -25,6 +25,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/compat.h> +#include <linux/syscalls.h> /* * Wrappers to pass the pt_regs argument. @@ -180,7 +181,7 @@ long ilp32_sys_sigaltstack(const stack_t __user *uss_ptr, */ #define sys_sigaltstack ilp32_sys_sigaltstack -#include <asm/syscalls.h> +#include <asm-generic/syscalls.h> #undef __SYSCALL #define __SYSCALL(nr, sym) [nr] = sym, |