diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 03:43:28 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:15 -0500 |
| commit | b774cc5cb6b3b53b276bb7d968e3579afc2922c5 (patch) | |
| tree | 922a12efa04f84d38e5e215fec3fe7d69874facc /arch/score/kernel | |
| parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) | |
| download | op-kernel-dev-b774cc5cb6b3b53b276bb7d968e3579afc2922c5.zip op-kernel-dev-b774cc5cb6b3b53b276bb7d968e3579afc2922c5.tar.gz | |
score: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/score/kernel')
| -rw-r--r-- | arch/score/kernel/entry.S | 5 | ||||
| -rw-r--r-- | arch/score/kernel/signal.c | 21 |
2 files changed, 2 insertions, 24 deletions
diff --git a/arch/score/kernel/entry.S b/arch/score/kernel/entry.S index 1557ca1..7234ed0 100644 --- a/arch/score/kernel/entry.S +++ b/arch/score/kernel/entry.S @@ -491,8 +491,3 @@ ENTRY(sys_rt_sigreturn) mv r4, r0 la r8, score_rt_sigreturn br r8 - -ENTRY(sys_sigaltstack) - mv r4, r0 - la r8, score_sigaltstack - br r8 diff --git a/arch/score/kernel/signal.c b/arch/score/kernel/signal.c index 02353bd..a00fba3 100644 --- a/arch/score/kernel/signal.c +++ b/arch/score/kernel/signal.c @@ -134,16 +134,6 @@ static void __user *get_sigframe(struct k_sigaction *ka, } asmlinkage long -score_sigaltstack(struct pt_regs *regs) -{ - const stack_t __user *uss = (const stack_t __user *) regs->regs[4]; - stack_t __user *uoss = (stack_t __user *) regs->regs[5]; - unsigned long usp = regs->regs[0]; - - return do_sigaltstack(uss, uoss, usp); -} - -asmlinkage long score_rt_sigreturn(struct pt_regs *regs) { struct rt_sigframe __user *frame; @@ -167,9 +157,7 @@ score_rt_sigreturn(struct pt_regs *regs) else if (sig) force_sig(sig, current); - /* It is more difficult to avoid calling this function than to - call it and ignore errors. */ - if (do_sigaltstack(&frame->rs_uc.uc_stack, NULL, regs->regs[0]) == -EFAULT) + if (restore_altstack(&frame->rs_uc.uc_stack)) goto badframe; regs->is_syscall = 0; @@ -209,12 +197,7 @@ static int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs, err |= copy_siginfo_to_user(&frame->rs_info, info); err |= __put_user(0, &frame->rs_uc.uc_flags); err |= __put_user(NULL, &frame->rs_uc.uc_link); - err |= __put_user((void __user *)current->sas_ss_sp, - &frame->rs_uc.uc_stack.ss_sp); - err |= __put_user(sas_ss_flags(regs->regs[0]), - &frame->rs_uc.uc_stack.ss_flags); - err |= __put_user(current->sas_ss_size, - &frame->rs_uc.uc_stack.ss_size); + err |= __save_altstack(&frame->rs_uc.uc_stack, regs->regs[0]); err |= setup_sigcontext(regs, &frame->rs_uc.uc_mcontext); err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set)); |
