diff options
-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, |