commit a610d6e672d6d3723e8da257ad4a8a288a8f2f89
author Al Viro <viro@zeniv.linux.org.uk> Mon May 21 23:42:15 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jun 01 12:58:49 2012 -0400
tree 2fac6ce7f72756771f4f87583205cc402589dcad
parent 5754f412a3f107cbcd93ee125bef296f2a07539b

pull clearing RESTORE_SIGMASK into block_sigmask()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

kernel/signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 95a9d9d..b9be7e0 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2382,6 +2382,12 @@
 {
 	sigset_t blocked;
 
+	/* A signal was successfully delivered, and the
+	   saved sigmask was stored on the signal frame,
+	   and will be restored by sigreturn.  So we can
+	   simply clear the restore sigmask flag.  */
+	clear_restore_sigmask();
+
 	sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
 	if (!(ka->sa.sa_flags & SA_NODEFER))
 		sigaddset(&blocked, signr);