summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/syscalls.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-02-11 16:31:40 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2009-02-11 16:31:40 -0800
commit744525092727827a9cf0044074db3e22dcf354fd (patch)
tree5079407a2fd7ad3cc5ab79976404916bd88808ea /arch/x86/include/asm/syscalls.h
parentb12bdaf11f935d7be030207e3c77faeaeab8ded3 (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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 77bb31a88ba..68b1be10cfa 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 *,
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 *);