4 files changed, 20 insertions, 26 deletions

diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index 4f97df87d7d5..4f643aa718e3 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -9,15 +9,9 @@
 
 struct pt_regs;
 
-asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
-                             unsigned long r6, unsigned long r7,
-                             struct pt_regs __regs);
-asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs);
-asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
-                           unsigned long r6, unsigned long r7,
-                           struct pt_regs __regs);
+asmlinkage int sys_sigreturn(void);
+asmlinkage int sys_rt_sigreturn(void);
+asmlinkage int sys_sh_pipe(void);
 asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf,
                                      size_t count, long dummy, loff_t pos);
 asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf,
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index ca46834294b7..13047a4facd2 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -193,10 +193,10 @@ syscall_trace_entry:
         !                       Reload R0-R4 from kernel stack, where the
         !                       parent may have modified them using
         !                       ptrace(POKEUSR).  (Note that R0-R2 are
-        !                       used by the system call handler directly
-        !                       from the kernel stack anyway, so don't need
-        !                       to be reloaded here.)  This allows the parent
-        !                       to rewrite system calls and args on the fly.
+        !                       reloaded from the kernel stack by syscall_call
+        !                       below, so don't need to be reloaded here.)
+        !                       This allows the parent to rewrite system calls
+        !                       and args on the fly.
         mov.l   @(OFF_R4,r15), r4   ! arg0
         mov.l   @(OFF_R5,r15), r5
         mov.l   @(OFF_R6,r15), r6
@@ -357,8 +357,15 @@ syscall_call:
         mov.l   3f, r8          ! Load the address of sys_call_table
         add     r8, r3
         mov.l   @r3, r8
+        mov.l   @(OFF_R2,r15), r2
+        mov.l   @(OFF_R1,r15), r1
+        mov.l   @(OFF_R0,r15), r0
+        mov.l   r2, @-r15
+        mov.l   r1, @-r15
+        mov.l   r0, @-r15
         jsr     @r8             ! jump to specific syscall handler
          nop
+        add     #12, r15
         mov.l   @(OFF_R0,r15), r12              ! save r0
         mov.l   r0, @(OFF_R0,r15)               ! save the return value
         !
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 6af6e7c5cac8..594cd371aa28 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -148,11 +148,9 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p
         return err;
 }
 
-asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
-                             unsigned long r6, unsigned long r7,
-                             struct pt_regs __regs)
+asmlinkage int sys_sigreturn(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         struct sigframe __user *frame = (struct sigframe __user *)regs->regs[15];
         sigset_t set;
         int r0;
@@ -180,11 +178,9 @@ badframe:
         return 0;
 }
 
-asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
-                                unsigned long r6, unsigned long r7,
-                                struct pt_regs __regs)
+asmlinkage int sys_rt_sigreturn(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
+        struct pt_regs *regs = current_pt_regs();
         struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->regs[15];
         sigset_t set;
         int r0;
diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c
index 497bab3a0401..b66d1c62eb19 100644
--- a/arch/sh/kernel/sys_sh32.c
+++ b/arch/sh/kernel/sys_sh32.c
@@ -21,17 +21,14 @@
  * sys_pipe() is the normal C calling standard for creating
  * a pipe. It's not the way Unix traditionally does this, though.
  */
-asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
-        unsigned long r6, unsigned long r7,
-        struct pt_regs __regs)
+asmlinkage int sys_sh_pipe(void)
 {
-        struct pt_regs *regs = RELOC_HIDE(&__regs, 0);
         int fd[2];
         int error;
 
         error = do_pipe_flags(fd, 0);
         if (!error) {
-                regs->regs[1] = fd[1];
+                current_pt_regs()->regs[1] = fd[1];
                 return fd[0];
         }
         return error;