diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-26 18:17:28 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-22 00:01:09 -0400 |
| commit | 415d04d08fec74b226c92c1fb54ad117c9c6bac4 (patch) | |
| tree | 75abbdd83cf3e20b92866e4981ecb27c44dc7e7d | |
| parent | a53bb24e7666870bbc195e295a936aa0a58ce313 (diff) | |
| download | linux-415d04d08fec74b226c92c1fb54ad117c9c6bac4.tar.gz linux-415d04d08fec74b226c92c1fb54ad117c9c6bac4.tar.bz2 linux-415d04d08fec74b226c92c1fb54ad117c9c6bac4.zip | |
unicore32: if there's no handler we need to restore sigmask, syscall or no syscall
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/unicore32/kernel/signal.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c index 72d953190419..7754df6ef7d4 100644 --- a/arch/unicore32/kernel/signal.c +++ b/arch/unicore32/kernel/signal.c @@ -447,15 +447,12 @@ static void do_signal(struct pt_regs *regs, int syscall) regs->UCreg_00 == -ERESTARTNOINTR) { setup_syscall_restart(regs); } - - /* If there's no signal to deliver, we just put the saved - * sigmask back. - */ - if (test_thread_flag(TIF_RESTORE_SIGMASK)) { - clear_thread_flag(TIF_RESTORE_SIGMASK); - sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); - } } + /* If there's no signal to deliver, we just put the saved + * sigmask back. + */ + if (test_and_clear_thread_flag(TIF_RESTORE_SIGMASK)) + set_current_blocked(¤t->saved_sigmask); } asmlinkage void do_notify_resume(struct pt_regs *regs, |