From 04cf4dd356981f757aeb043625cf2c6d391e9cd1 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 23 Dec 2012 02:07:30 -0500
Subject: [PATCH] --- yaml --- r: 356673 b: refs/heads/master c:
 d970e42897525adc836207b44ef64347e59d613e h: refs/heads/master i:   356671:
 9e023ceb9ec558d484bfc2f64b661f8091937034 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/c6x/Kconfig                   |  1 -
 trunk/arch/c6x/kernel/entry.S            | 12 ++++++++++++
 trunk/arch/cris/Kconfig                  |  1 +
 trunk/arch/cris/arch-v10/kernel/signal.c |  8 +-------
 trunk/arch/cris/arch-v32/kernel/signal.c |  8 +-------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 5aee64c3c84e..05707d5b20ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ec78be4cdff4db6e6ea930db9f5d912bc05febc
+refs/heads/master: d970e42897525adc836207b44ef64347e59d613e
diff --git a/trunk/arch/c6x/Kconfig b/trunk/arch/c6x/Kconfig
index 12d97b7ef0dc..f6a3648f5ec3 100644
--- a/trunk/arch/c6x/Kconfig
+++ b/trunk/arch/c6x/Kconfig
@@ -18,7 +18,6 @@ config C6X
 	select OF_EARLY_FLATTREE
 	select GENERIC_CLOCKEVENTS
 	select MODULES_USE_ELF_RELA
-	select GENERIC_SIGALTSTACK
 
 config MMU
 	def_bool n
diff --git a/trunk/arch/c6x/kernel/entry.S b/trunk/arch/c6x/kernel/entry.S
index 2721c90b0121..5239057de4c4 100644
--- a/trunk/arch/c6x/kernel/entry.S
+++ b/trunk/arch/c6x/kernel/entry.S
@@ -598,6 +598,18 @@ ENTRY(enable_exception)
 	NOP	5
 ENDPROC(enable_exception)
 
+ENTRY(sys_sigaltstack)
+#ifdef CONFIG_C6X_BIG_KERNEL
+	MVKL	.S1	do_sigaltstack,A0	; branch to do_sigaltstack
+	MVKH	.S1	do_sigaltstack,A0
+	B	.S2X	A0
+#else
+	B	.S2	do_sigaltstack
+#endif
+	LDW	.D2T1	*+SP(REGS_SP+8),A6
+	NOP	4
+ENDPROC(sys_sigaltstack)
+
 	;;
 	;; Special system calls
 	;; return address is in B3
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
index c59a01dd9c0c..22d470276408 100644
--- a/trunk/arch/cris/Kconfig
+++ b/trunk/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/trunk/arch/cris/arch-v10/kernel/signal.c b/trunk/arch/cris/arch-v10/kernel/signal.c
index 0bb477c13a4e..187237f655e6 100644
--- a/trunk/arch/cris/arch-v10/kernel/signal.c
+++ b/trunk/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/trunk/arch/cris/arch-v32/kernel/signal.c b/trunk/arch/cris/arch-v32/kernel/signal.c
index b60d1b65a426..168b6958e2b8 100644
--- a/trunk/arch/cris/arch-v32/kernel/signal.c
+++ b/trunk/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);