From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 23 Dec 2012 07:13:57 +0000 (-0500)
Subject: frv: switch to generic sigaltstack
X-Git-Tag: next-20130218~6^2~6^8~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fe76141671c3025cd0da7cfafb6d8945bbe0735b;p=karo-tx-linux.git

frv: switch to generic sigaltstack

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

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 9d262645f667..8aaf1a174270 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -12,6 +12,7 @@ config FRV
 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 	select GENERIC_CPU_DEVICES
 	select ARCH_WANT_IPC_PARSE_VERSION
+	select GENERIC_SIGALTSTACK
 
 config ZONE_DMA
 	bool
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 535810a3217a..445156d2d30b 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -74,13 +74,6 @@ asmlinkage int sys_sigaction(int sig,
 	return ret;
 }
 
-asmlinkage
-int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
-{
-	return do_sigaltstack(uss, uoss, __frame->sp);
-}
-
-
 /*
  * Do a signal return; undo the signal stack.
  */
@@ -173,7 +166,7 @@ asmlinkage int sys_rt_sigreturn(void)
 	if (restore_sigcontext(&frame->uc.uc_mcontext, &gr8))
 		goto badframe;
 
-	if (do_sigaltstack(&frame->uc.uc_stack, NULL, __frame->sp) == -EFAULT)
+	if (restore_altstack(&frame->uc.uc_stack))
 		goto badframe;
 
 	return gr8;
@@ -345,9 +338,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	/* Create the ucontext.  */
 	if (__put_user(0, &frame->uc.uc_flags) ||
 	    __put_user(NULL, &frame->uc.uc_link) ||
-	    __put_user((void __user *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp) ||
-	    __put_user(sas_ss_flags(__frame->sp), &frame->uc.uc_stack.ss_flags) ||
-	    __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size))
+	    __save_altstack(&frame->uc.uc_stack, __frame->sp))
 		goto give_sigsegv;
 
 	if (setup_sigcontext(&frame->uc.uc_mcontext, set->sig[0]))