lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: merge sys_rt_sigreturn between 32 and 64 bits

Browse Source 
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>
This commit is contained in:
H. Peter Anvin
2009-02-11 16:31:40 -08:00
parent b12bdaf11f
commit 7445250927
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/syscalls.h
View File

@@ -40,7 +40,7 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
struct old_sigaction __user *); struct old_sigaction __user *);
int sys_sigaltstack(struct pt_regs *); int sys_sigaltstack(struct pt_regs *);
unsigned long sys_sigreturn(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 */ /* kernel/ioport.c */
long sys_iopl(struct pt_regs *); long sys_iopl(struct pt_regs *);

14
arch/x86/kernel/signal.c
View File

@@ -601,7 +601,7 @@ badframe:
} }
#endif /* CONFIG_X86_32 */ #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; struct rt_sigframe __user *frame;
unsigned long ax; unsigned long ax;
@@ -632,18 +632,6 @@ badframe:
return 0; 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: * OK, we're invoking a handler:
*/ */