ia64: switch to generic sigaltstack

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 4 insertions, 16 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3279646120e3..98482d1cbc5b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -42,6 +42,7 @@ config IA64
         select GENERIC_TIME_VSYSCALL_OLD
         select HAVE_MOD_ARCH_SPECIFIC
         select MODULES_USE_ELF_RELA
+        select GENERIC_SIGALTSTACK
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
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 @@
 # define GET_SIGSET(k,u)        __get_user((k)->sig[0], &(u)->sig[0])
 #endif
 
-asmlinkage long
-sys_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, long arg2,
-                 long arg3, long arg4, long arg5, long arg6, long arg7,
-                 struct pt_regs regs)
-{
-        return do_sigaltstack(uss, uoss, regs.r12);
-}
-
 static long
 restore_sigcontext (struct sigcontext __user *sc, struct sigscratch *scr)
 {
@@ -208,11 +200,8 @@ ia64_rt_sigreturn (struct sigscratch *scr)
         printk("SIG return (%s:%d): sp=%lx ip=%lx\n",
                current->comm, current->pid, scr->pt.r12, scr->pt.cr_iip);
 #endif
-        /*
-         * It is more difficult to avoid calling this function than to
-         * call it and ignore errors.
-         */
-        do_sigaltstack(&sc->sc_stack, NULL, scr->pt.r12);
+        if (restore_altstack(&sc->sc_stack))
+                goto give_sigsegv;
         return retval;
 
   give_sigsegv:
@@ -376,9 +365,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
 
         err |= copy_siginfo_to_user(&frame->info, info);
 
-        err |= __put_user(current->sas_ss_sp, &frame->sc.sc_stack.ss_sp);
-        err |= __put_user(current->sas_ss_size, &frame->sc.sc_stack.ss_size);
-        err |= __put_user(sas_ss_flags(scr->pt.r12), &frame->sc.sc_stack.ss_flags);
+        err |= __save_altstack(&frame->sc.sc_stack, scr->pt.r12);
         err |= setup_sigcontext(&frame->sc, set, scr);
 
         if (unlikely(err))