Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4217458d authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar
Browse files

x86: signal: change type of paramter for sys_rt_sigreturn() 



Impact: cleanup on 32-bit

Peter pointed this parameter can be changed.

Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5ceb40da

arch/x86/include/asm/syscalls.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, 
			     struct old_sigaction __user *);

asmlinkage int sys_sigaltstack(unsigned long);

asmlinkage unsigned long sys_sigreturn(unsigned long);

asmlinkage int sys_rt_sigreturn(unsigned long);

asmlinkage int sys_rt_sigreturn(struct pt_regs);



/* kernel/ioport.c */

asmlinkage long sys_iopl(unsigned long);

arch/x86/kernel/signal.c

+2 −4
Original line number Diff line number Diff line
@@ -642,11 +642,9 @@ static long do_rt_sigreturn(struct pt_regs *regs) 
}



#ifdef CONFIG_X86_32

asmlinkage int sys_rt_sigreturn(unsigned long __unused)

asmlinkage int sys_rt_sigreturn(struct pt_regs regs)

{

	struct pt_regs *regs = (struct pt_regs *)&__unused;



	return do_rt_sigreturn(regs);

	return do_rt_sigreturn(&regs);

}

#else /* !CONFIG_X86_32 */

asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)