Commit 74452509 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent b12bdaf1

arch/x86/include/asm/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

arch/x86/kernel/signal.c

+1 −13
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ badframe: 
}

#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;
@@ -632,18 +632,6 @@ badframe: 
	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:

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE