From 7dfae72027cd8345247e675a3b27439df95fe06e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 26 Apr 2012 18:15:11 -0400 Subject: [PATCH] arm: if there's no handler we need to restore sigmask, syscall or no syscall Signed-off-by: Al Viro --- arch/arm/kernel/signal.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index d554025dbcbc..a6c4e780ec7a 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c @@ -715,15 +715,13 @@ static void do_signal(struct pt_regs *regs, int syscall) #endif } } - - /* 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 -- 2.34.1