diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:00:19 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:14:41 -0400 |
| commit | 78722a445bb253fa6bcbe9d6589f27db78056af6 (patch) | |
| tree | a862b8a8f1a0193467629d8b38d8d36a1fa43697 /arch/um/sys-i386 | |
| parent | d118c135489bd835d3c450c7dec3126f9fc4605e (diff) | |
um: switch {rt_,}sigreturn() to set_current_blocked()
same story as on x86 native...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-i386')
| -rw-r--r-- | arch/um/sys-i386/signal.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index 89a46626bfd8..4403b48ab044 100644 --- a/arch/um/sys-i386/signal.c +++ b/arch/um/sys-i386/signal.c | |||
| @@ -458,11 +458,7 @@ long sys_sigreturn(struct pt_regs regs) | |||
| 458 | goto segfault; | 458 | goto segfault; |
| 459 | 459 | ||
| 460 | sigdelsetmask(&set, ~_BLOCKABLE); | 460 | sigdelsetmask(&set, ~_BLOCKABLE); |
| 461 | 461 | set_current_blocked(&set); | |
| 462 | spin_lock_irq(¤t->sighand->siglock); | ||
| 463 | current->blocked = set; | ||
| 464 | recalc_sigpending(); | ||
| 465 | spin_unlock_irq(¤t->sighand->siglock); | ||
| 466 | 462 | ||
| 467 | if (copy_sc_from_user(¤t->thread.regs, sc)) | 463 | if (copy_sc_from_user(¤t->thread.regs, sc)) |
| 468 | goto segfault; | 464 | goto segfault; |
| @@ -489,11 +485,7 @@ long sys_rt_sigreturn(struct pt_regs regs) | |||
| 489 | goto segfault; | 485 | goto segfault; |
| 490 | 486 | ||
| 491 | sigdelsetmask(&set, ~_BLOCKABLE); | 487 | sigdelsetmask(&set, ~_BLOCKABLE); |
| 492 | 488 | set_current_blocked(&set); | |
| 493 | spin_lock_irq(¤t->sighand->siglock); | ||
| 494 | current->blocked = set; | ||
| 495 | recalc_sigpending(); | ||
| 496 | spin_unlock_irq(¤t->sighand->siglock); | ||
| 497 | 489 | ||
| 498 | if (copy_sc_from_user(¤t->thread.regs, &uc->uc_mcontext)) | 490 | if (copy_sc_from_user(¤t->thread.regs, &uc->uc_mcontext)) |
| 499 | goto segfault; | 491 | goto segfault; |
