aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/syscalls.h2
-rw-r--r--arch/x86/kernel/signal.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 87803da44010..3a5252c4b8d6 100644
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -33,7 +33,7 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
33 struct old_sigaction __user *); 33 struct old_sigaction __user *);
34asmlinkage int sys_sigaltstack(unsigned long); 34asmlinkage int sys_sigaltstack(unsigned long);
35asmlinkage unsigned long sys_sigreturn(unsigned long); 35asmlinkage unsigned long sys_sigreturn(unsigned long);
36asmlinkage int sys_rt_sigreturn(unsigned long); 36asmlinkage int sys_rt_sigreturn(struct pt_regs);
37 37
38/* kernel/ioport.c */ 38/* kernel/ioport.c */
39asmlinkage long sys_iopl(unsigned long); 39asmlinkage long sys_iopl(unsigned long);
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index b1f4d34e0a38..b1cc6da64208 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -642,11 +642,9 @@ badframe:
642} 642}
643 643
644#ifdef CONFIG_X86_32 644#ifdef CONFIG_X86_32
645asmlinkage int sys_rt_sigreturn(unsigned long __unused) 645asmlinkage int sys_rt_sigreturn(struct pt_regs regs)
646{ 646{
647 struct pt_regs *regs = (struct pt_regs *)&__unused; 647 return do_rt_sigreturn(&regs);
648
649 return do_rt_sigreturn(regs);
650} 648}
651#else /* !CONFIG_X86_32 */ 649#else /* !CONFIG_X86_32 */
652asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) 650asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)