diff options
-rw-r--r-- | arch/x86/include/asm/syscalls.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/signal.c | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h index 77bb31a88ba8..68b1be10cfad 100644 --- a/arch/x86/include/asm/syscalls.h +++ b/arch/x86/include/asm/syscalls.h | |||
@@ -40,7 +40,7 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, | |||
40 | struct old_sigaction __user *); | 40 | struct old_sigaction __user *); |
41 | int sys_sigaltstack(struct pt_regs *); | 41 | int sys_sigaltstack(struct pt_regs *); |
42 | unsigned long sys_sigreturn(struct pt_regs *); | 42 | unsigned long sys_sigreturn(struct pt_regs *); |
43 | int sys_rt_sigreturn(struct pt_regs *); | 43 | long sys_rt_sigreturn(struct pt_regs *); |
44 | 44 | ||
45 | /* kernel/ioport.c */ | 45 | /* kernel/ioport.c */ |
46 | long sys_iopl(struct pt_regs *); | 46 | long sys_iopl(struct pt_regs *); |
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index ccfb27412f0f..7cdcd16885ed 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -601,7 +601,7 @@ badframe: | |||
601 | } | 601 | } |
602 | #endif /* CONFIG_X86_32 */ | 602 | #endif /* CONFIG_X86_32 */ |
603 | 603 | ||
604 | static long do_rt_sigreturn(struct pt_regs *regs) | 604 | long sys_rt_sigreturn(struct pt_regs *regs) |
605 | { | 605 | { |
606 | struct rt_sigframe __user *frame; | 606 | struct rt_sigframe __user *frame; |
607 | unsigned long ax; | 607 | unsigned long ax; |
@@ -632,18 +632,6 @@ badframe: | |||
632 | return 0; | 632 | return 0; |
633 | } | 633 | } |
634 | 634 | ||
635 | #ifdef CONFIG_X86_32 | ||
636 | int sys_rt_sigreturn(struct pt_regs *regs) | ||
637 | { | ||
638 | return do_rt_sigreturn(regs); | ||
639 | } | ||
640 | #else /* !CONFIG_X86_32 */ | ||
641 | asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) | ||
642 | { | ||
643 | return do_rt_sigreturn(regs); | ||
644 | } | ||
645 | #endif /* CONFIG_X86_32 */ | ||
646 | |||
647 | /* | 635 | /* |
648 | * OK, we're invoking a handler: | 636 | * OK, we're invoking a handler: |
649 | */ | 637 | */ |