aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/signal.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-12 14:32:42 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:16:24 -0500
commit3fe26fa34da029263067b48836e740c1ddffbd91 (patch)
treec4a0900f708b1baadbb80938e763eb82174370b8 /arch/x86/kernel/signal.c
parentb3af11afe06abdcf980b5f5c0b44dc46c496ddc3 (diff)
x86: get rid of pt_regs argument in sigreturn variants
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/kernel/signal.c')
-rw-r--r--arch/x86/kernel/signal.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index d6bf1f34a6e9..38ba7e56e161 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -597,8 +597,9 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
597 * Do a signal return; undo the signal stack. 597 * Do a signal return; undo the signal stack.
598 */ 598 */
599#ifdef CONFIG_X86_32 599#ifdef CONFIG_X86_32
600unsigned long sys_sigreturn(struct pt_regs *regs) 600unsigned long sys_sigreturn(void)
601{ 601{
602 struct pt_regs *regs = current_pt_regs();
602 struct sigframe __user *frame; 603 struct sigframe __user *frame;
603 unsigned long ax; 604 unsigned long ax;
604 sigset_t set; 605 sigset_t set;
@@ -625,8 +626,9 @@ badframe:
625} 626}
626#endif /* CONFIG_X86_32 */ 627#endif /* CONFIG_X86_32 */
627 628
628long sys_rt_sigreturn(struct pt_regs *regs) 629long sys_rt_sigreturn(void)
629{ 630{
631 struct pt_regs *regs = current_pt_regs();
630 struct rt_sigframe __user *frame; 632 struct rt_sigframe __user *frame;
631 unsigned long ax; 633 unsigned long ax;
632 sigset_t set; 634 sigset_t set;
@@ -843,8 +845,9 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
843} 845}
844 846
845#ifdef CONFIG_X86_X32_ABI 847#ifdef CONFIG_X86_X32_ABI
846asmlinkage long sys32_x32_rt_sigreturn(struct pt_regs *regs) 848asmlinkage long sys32_x32_rt_sigreturn(void)
847{ 849{
850 struct pt_regs *regs = current_pt_regs();
848 struct rt_sigframe_x32 __user *frame; 851 struct rt_sigframe_x32 __user *frame;
849 sigset_t set; 852 sigset_t set;
850 unsigned long ax; 853 unsigned long ax;