---

yaml --- r: 309005 b: refs/heads/master c: 7dfae72 h: refs/heads/master i: 309003: f6a7a76 v: v3
git-mirror · May 21, 2012 · c86df37 · c86df37
1 parent 131cbad
commit c86df37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84849b3ed8081e9e2eb0e441c699eda807853cb6
+refs/heads/master: 7dfae72027cd8345247e675a3b27439df95fe06e
diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/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, &current->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(&current->saved_sigmask);
 }
 
 asmlinkage void