diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 02:07:30 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:52 -0500 |
| commit | d970e42897525adc836207b44ef64347e59d613e (patch) | |
| tree | 3293ef9b4c11fc48345cd7a0c316c881acd9c910 | |
| parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) | |
| download | blackbird-op-linux-d970e42897525adc836207b44ef64347e59d613e.tar.gz blackbird-op-linux-d970e42897525adc836207b44ef64347e59d613e.zip | |
cris: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/cris/Kconfig | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 8 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 8 |
3 files changed, 3 insertions, 14 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index c59a01dd9c0c..22d470276408 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -50,6 +50,7 @@ config CRIS select GENERIC_CMOS_UPDATE select MODULES_USE_ELF_RELA select CLONE_BACKWARDS2 + select GENERIC_SIGALTSTACK config HZ int diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 0bb477c13a4e..187237f655e6 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c @@ -84,12 +84,6 @@ int sys_sigaction(int sig, const struct old_sigaction __user *act, return ret; } -int sys_sigaltstack(const stack_t *uss, stack_t __user *uoss) -{ - return do_sigaltstack(uss, uoss, rdusp()); -} - - /* * Do a signal return; undo the signal stack. */ @@ -214,7 +208,7 @@ asmlinkage int sys_rt_sigreturn(long r10, long r11, long r12, long r13, if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) goto badframe; - if (do_sigaltstack(&frame->uc.uc_stack, NULL, rdusp()) == -EFAULT) + if (restore_altstack(&frame->uc.uc_stack)) goto badframe; return regs->r10; diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index b60d1b65a426..168b6958e2b8 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c @@ -99,12 +99,6 @@ sys_sigaction(int signal, const struct old_sigaction *act, return retval; } -int -sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss) -{ - return do_sigaltstack(uss, uoss, rdusp()); -} - static int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) { @@ -209,7 +203,7 @@ sys_rt_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp, if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) goto badframe; - if (do_sigaltstack(&frame->uc.uc_stack, NULL, rdusp()) == -EFAULT) + if (restore_altstack(&frame->uc.uc_stack)) goto badframe; keep_debug_flags(oldccs, oldspc, regs); |
