diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-11 19:31:40 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-11 19:31:40 -0500 |
commit | 744525092727827a9cf0044074db3e22dcf354fd (patch) | |
tree | 5079407a2fd7ad3cc5ab79976404916bd88808ea /arch/x86/include/asm/syscalls.h | |
parent | b12bdaf11f935d7be030207e3c77faeaeab8ded3 (diff) |
x86: merge sys_rt_sigreturn between 32 and 64 bits
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>
Diffstat (limited to 'arch/x86/include/asm/syscalls.h')
-rw-r--r-- | arch/x86/include/asm/syscalls.h | 2 |
1 files changed, 1 insertions, 1 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 *); |