---

yaml --- r: 305317 b: refs/heads/master c: 5a30a79 h: refs/heads/master i: 305315: a149b3e v: v3
git-mirror · May 21, 2012 · f1d0c42 · f1d0c42
1 parent 4b6ec15
commit f1d0c42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d50349b0c397407458ea8c57aee765d158e6f9ee
+refs/heads/master: 5a30a798fb501429522a30b6027a603244d659b2
diff --git a/trunk/arch/um/kernel/signal.c b/trunk/arch/um/kernel/signal.c
@@ -74,15 +74,14 @@ static int kern_do_signal(struct pt_regs *regs)
 {
 	struct k_sigaction ka_copy;
 	siginfo_t info;
-	sigset_t *oldset;
 	int sig, handled_sig = 0;
 
-	if (test_thread_flag(TIF_RESTORE_SIGMASK))
-		oldset = &current->saved_sigmask;
-	else
-		oldset = &current->blocked;
-
 	while ((sig = get_signal_to_deliver(&info, &ka_copy, regs, NULL)) > 0) {
+		sigset_t *oldset;
+		if (test_thread_flag(TIF_RESTORE_SIGMASK))
+			oldset = &current->saved_sigmask;
+		else
+			oldset = &current->blocked;
 		handled_sig = 1;
 		/* Whee!  Actually deliver the signal.  */
 		if (!handle_signal(regs, sig, &ka_copy, &info, oldset)) {