diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-22 07:42:15 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 20:58:49 +0400 |
| commit | a610d6e672d6d3723e8da257ad4a8a288a8f2f89 (patch) | |
| tree | 2fac6ce7f72756771f4f87583205cc402589dcad /arch/ia64/kernel | |
| parent | 5754f412a3f107cbcd93ee125bef296f2a07539b (diff) | |
| download | linux-a610d6e672d6d3723e8da257ad4a8a288a8f2f89.tar.xz | |
pull clearing RESTORE_SIGMASK into block_sigmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/signal.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c index 9fee6d6a3f21..dc6fe6573465 100644 --- a/arch/ia64/kernel/signal.c +++ b/arch/ia64/kernel/signal.c @@ -501,16 +501,8 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall) * Whee! Actually deliver the signal. If the delivery failed, we need to * continue to iterate in this loop so we can deliver the SIGSEGV... */ - if (handle_signal(signr, &ka, &info, scr)) { - /* - * A signal was successfully delivered; the saved - * sigmask will have been stored in the signal frame, - * and will be restored by sigreturn, so we can simply - * clear the TS_RESTORE_SIGMASK flag. - */ - current_thread_info()->status &= ~TS_RESTORE_SIGMASK; + if (handle_signal(signr, &ka, &info, scr)) return; - } } /* Did we come from a system call? */ |