Skip to content

Commit

Permalink
x86: signal: change type of paramter for sys_rt_sigreturn()
Browse files Browse the repository at this point in the history
Impact: cleanup on 32-bit

Peter pointed this parameter can be changed.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Hiroshi Shimamoto authored and Ingo Molnar committed Dec 8, 2008
1 parent 5ceb40d commit 4217458
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 2 additions & 4 deletions arch/x86/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4217458

Please sign in to comment.