diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 02:52:40 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:58 -0500 |
commit | e8d9ef09df5f86f564a2ab6e8f1397121b1bad66 (patch) | |
tree | 41aca13ff329fe314a1ebbe3daa021d2f9a4eaed /arch/ia64/kernel/signal.c | |
parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) |
ia64: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/ia64/kernel/signal.c')
-rw-r--r-- | arch/ia64/kernel/signal.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index 680b73786be8..3637e03d2282 100644 --- a/arch/ia64/kernel/signal.c +++ b/arch/ia64/kernel/signal.c | |||
@@ -39,14 +39,6 @@ | |||
39 | # define GET_SIGSET(k,u) __get_user((k)->sig[0], &(u)->sig[0]) | 39 | # define GET_SIGSET(k,u) __get_user((k)->sig[0], &(u)->sig[0]) |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | asmlinkage long | ||
43 | sys_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, long arg2, | ||
44 | long arg3, long arg4, long arg5, long arg6, long arg7, | ||
45 | struct pt_regs regs) | ||
46 | { | ||
47 | return do_sigaltstack(uss, uoss, regs.r12); | ||
48 | } | ||
49 | |||
50 | static long | 42 | static long |
51 | restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr) | 43 | restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr) |
52 | { | 44 | { |
@@ -208,11 +200,8 @@ ia64_rt_sigreturn (struct sigscratch *scr) | |||
208 | printk("SIG return (%s:%d): sp=%lx ip=%lx\n", | 200 | printk("SIG return (%s:%d): sp=%lx ip=%lx\n", |
209 | current->comm, current->pid, scr->pt.r12, scr->pt.cr_iip); | 201 | current->comm, current->pid, scr->pt.r12, scr->pt.cr_iip); |
210 | #endif | 202 | #endif |
211 | /* | 203 | if (restore_altstack(&sc->sc_stack)) |
212 | * It is more difficult to avoid calling this function than to | 204 | goto give_sigsegv; |
213 | * call it and ignore errors. | ||
214 | */ | ||
215 | do_sigaltstack(&sc->sc_stack, NULL, scr->pt.r12); | ||
216 | return retval; | 205 | return retval; |
217 | 206 | ||
218 | give_sigsegv: | 207 | give_sigsegv: |
@@ -376,9 +365,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, | |||
376 | 365 | ||
377 | err |= copy_siginfo_to_user(&frame->info, info); | 366 | err |= copy_siginfo_to_user(&frame->info, info); |
378 | 367 | ||
379 | err |= __put_user(current->sas_ss_sp, &frame->sc.sc_stack.ss_sp); | 368 | err |= __save_altstack(&frame->sc.sc_stack, scr->pt.r12); |
380 | err |= __put_user(current->sas_ss_size, &frame->sc.sc_stack.ss_size); | ||
381 | err |= __put_user(sas_ss_flags(scr->pt.r12), &frame->sc.sc_stack.ss_flags); | ||
382 | err |= setup_sigcontext(&frame->sc, set, scr); | 369 | err |= setup_sigcontext(&frame->sc, set, scr); |
383 | 370 | ||
384 | if (unlikely(err)) | 371 | if (unlikely(err)) |