Skip to content

Commit

Permalink
mips: sigsuspend() is essentially the same as rt_sigsuspend() here
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Feb 3, 2013
1 parent ea5d83d commit 1910f4a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
10 changes: 2 additions & 8 deletions arch/mips/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,9 @@ void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
*/

#ifdef CONFIG_TRAD_SIGNALS
asmlinkage int sys_sigsuspend(nabi_no_regargs struct pt_regs regs)
SYSCALL_DEFINE1(sigsuspend, sigset_t __user *, uset)
{
sigset_t newset;
sigset_t __user *uset;

uset = (sigset_t __user *) regs.regs[4];
if (copy_from_user(&newset, uset, sizeof(sigset_t)))
return -EFAULT;
return sigsuspend(&newset);
return sys_rt_sigsuspend(uset, sizeof(sigset_t));
}
#endif

Expand Down
10 changes: 2 additions & 8 deletions arch/mips/kernel/signal32.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,15 +273,9 @@ static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t __user *ubuf)
* Atomically swap in the new signal mask, and wait for a signal.
*/

asmlinkage int sys32_sigsuspend(nabi_no_regargs struct pt_regs regs)
asmlinkage int sys32_sigsuspend(compat_sigset_t __user *uset)
{
compat_sigset_t __user *uset;
sigset_t newset;

uset = (compat_sigset_t __user *) regs.regs[4];
if (get_sigset(&newset, uset))
return -EFAULT;
return sigsuspend(&newset);
return compat_sys_rt_sigsuspend(uset, sizeof(compat_sigset_t));
}

SYSCALL_DEFINE3(32_sigaction, long, sig, const struct sigaction32 __user *, act,
Expand Down

0 comments on commit 1910f4a

Please sign in to comment.