From 6ec0614bcc8684e3a092e3c2869912d66e540afe Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 26 Dec 2012 22:11:53 -0500
Subject: [PATCH] --- yaml --- r: 356677 b: refs/heads/master c:
 e6a6d210e0c2ad95047e2922394fb6e73bf438ab h: refs/heads/master i:   356675:
 512ca8536ec50566baa9238f52e03ae9f0b3baf3 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/cris/arch-v10/kernel/signal.c | 12 ++++--------
 trunk/arch/cris/arch-v32/kernel/signal.c | 12 ++++--------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 38ca15e28e08..3b4d81252249 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb2f256682e5af4b890d1f3cce4a4d4b62ffa655
+refs/heads/master: e6a6d210e0c2ad95047e2922394fb6e73bf438ab
diff --git a/trunk/arch/cris/arch-v10/kernel/signal.c b/trunk/arch/cris/arch-v10/kernel/signal.c
index 090e9c64408b..61ce6273a895 100644
--- a/trunk/arch/cris/arch-v10/kernel/signal.c
+++ b/trunk/arch/cris/arch-v10/kernel/signal.c
@@ -101,11 +101,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
 	return 1;
 }
 
-/* Define dummy arguments to be able to reach the regs argument.  */
-
-asmlinkage int sys_sigreturn(long r10, long r11, long r12, long r13, long mof,
-                             long srp, struct pt_regs *regs)
+asmlinkage int sys_sigreturn(void)
 {
+	struct pt_regs *regs = current_pt_regs();
 	struct sigframe __user *frame = (struct sigframe *)rdusp();
 	sigset_t set;
 
@@ -139,11 +137,9 @@ asmlinkage int sys_sigreturn(long r10, long r11, long r12, long r13, long mof,
 	return 0;
 }
 
-/* Define dummy arguments to be able to reach the regs argument.  */
-
-asmlinkage int sys_rt_sigreturn(long r10, long r11, long r12, long r13,
-                                long mof, long srp, struct pt_regs *regs)
+asmlinkage int sys_rt_sigreturn(void)
 {
+	struct pt_regs *regs = current_pt_regs();
 	struct rt_sigframe __user *frame = (struct rt_sigframe *)rdusp();
 	sigset_t set;
 
diff --git a/trunk/arch/cris/arch-v32/kernel/signal.c b/trunk/arch/cris/arch-v32/kernel/signal.c
index cee740732d1f..01d1375c9004 100644
--- a/trunk/arch/cris/arch-v32/kernel/signal.c
+++ b/trunk/arch/cris/arch-v32/kernel/signal.c
@@ -82,11 +82,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
 	return 1;
 }
 
-/* Define some dummy arguments to be able to reach the regs argument. */
-asmlinkage int
-sys_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp,
-	      struct pt_regs *regs)
+asmlinkage int sys_sigreturn(void)
 {
+	struct pt_regs *regs = current_pt_regs();
 	sigset_t set;
 	struct signal_frame __user *frame;
 	unsigned long oldspc = regs->spc;
@@ -125,11 +123,9 @@ sys_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp,
 	return 0;
 }
 
-/* Define some dummy variables to be able to reach the regs argument. */
-asmlinkage int
-sys_rt_sigreturn(long r10, long r11, long r12, long r13, long mof, long srp,
-		 struct pt_regs *regs)
+asmlinkage int sys_rt_sigreturn(void)
 {
+	struct pt_regs *regs = current_pt_regs();
 	sigset_t set;
 	struct rt_signal_frame __user *frame;
 	unsigned long oldspc = regs->spc;