Skip to content

Commit

Permalink
x86: merge sys_rt_sigreturn between 32 and 64 bits
Browse files Browse the repository at this point in the history
Impact: cleanup

With the recent changes in the 32-bit code to make system calls which
use struct pt_regs take a pointer, sys_rt_sigreturn() have become
identical between 32 and 64 bits, and both are empty wrappers around
do_rt_sigreturn().  Remove both wrappers and rename both to
sys_rt_sigreturn().

Cc: Brian Gerst <brgerst@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
H. Peter Anvin committed Feb 12, 2009
1 parent b12bdaf commit 7445250
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
struct old_sigaction __user *);
int sys_sigaltstack(struct pt_regs *);
unsigned long sys_sigreturn(struct pt_regs *);
int sys_rt_sigreturn(struct pt_regs *);
long sys_rt_sigreturn(struct pt_regs *);

/* kernel/ioport.c */
long sys_iopl(struct pt_regs *);
Expand Down
14 changes: 1 addition & 13 deletions arch/x86/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ unsigned long sys_sigreturn(struct pt_regs *regs)
}
#endif /* CONFIG_X86_32 */

static long do_rt_sigreturn(struct pt_regs *regs)
long sys_rt_sigreturn(struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
unsigned long ax;
Expand Down Expand Up @@ -632,18 +632,6 @@ static long do_rt_sigreturn(struct pt_regs *regs)
return 0;
}

#ifdef CONFIG_X86_32
int sys_rt_sigreturn(struct pt_regs *regs)
{
return do_rt_sigreturn(regs);
}
#else /* !CONFIG_X86_32 */
asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
{
return do_rt_sigreturn(regs);
}
#endif /* CONFIG_X86_32 */

/*
* OK, we're invoking a handler:
*/
Expand Down

0 comments on commit 7445250

Please sign in to comment.