From f1d0c42609c30d93ef5c60e743d095e6cebc6c3e Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 26 Apr 2012 23:25:06 -0400
Subject: [PATCH] --- yaml --- r: 305317 b: refs/heads/master c:
 5a30a798fb501429522a30b6027a603244d659b2 h: refs/heads/master i:   305315:
 a149b3ed82e9bb5082458e554a55ac4ece54985a v: v3

---
 [refs]                        |  2 +-
 trunk/arch/um/kernel/signal.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1591df272fb0..30c3351c1a6f 100644
--- 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
index 0dfcef92ec91..187118fbe1bc 100644
--- 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)) {