x86: get rid of pt_regs argument in sigreturn variants

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

2 files changed, 9 insertions, 8 deletions

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index a1daf4a65009..15fdb3f57d8c 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -215,8 +215,9 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
         return err;
 }
 
-asmlinkage long sys32_sigreturn(struct pt_regs *regs)
+asmlinkage long sys32_sigreturn(void)
 {
+        struct pt_regs *regs = current_pt_regs();
         struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8);
         sigset_t set;
         unsigned int ax;
@@ -241,8 +242,9 @@ badframe:
         return 0;
 }
 
-asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs)
+asmlinkage long sys32_rt_sigreturn(void)
 {
+        struct pt_regs *regs = current_pt_regs();
         struct rt_sigframe_ia32 __user *frame;
         sigset_t set;
         unsigned int ax;
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 74bc91e3612b..c05e16b4536b 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -456,17 +456,16 @@ ia32_badsys:
         ALIGN
 GLOBAL(\label)
         leaq \func(%rip),%rax
-        leaq -ARGOFFSET+8(%rsp),\arg    /* 8 for return address */
         jmp  ia32_ptregs_common 
         .endm
 
         CFI_STARTPROC32
 
-        PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi
-        PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi
-        PTREGSCALL stub32_execve, compat_sys_execve, %rcx
-        PTREGSCALL stub32_fork, sys_fork, %rdi
-        PTREGSCALL stub32_vfork, sys_vfork, %rdi
+        PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn
+        PTREGSCALL stub32_sigreturn, sys32_sigreturn
+        PTREGSCALL stub32_execve, compat_sys_execve
+        PTREGSCALL stub32_fork, sys_fork
+        PTREGSCALL stub32_vfork, sys_vfork
 
         ALIGN
 GLOBAL(stub32_clone)