From ceeac6da593a61356e95b976d90b26ccdee3f6df Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Tue, 15 Dec 2009 16:47:26 -0800
Subject: [PATCH] --- yaml --- r: 176688 b: refs/heads/master c:
 1be53963b0519bd3681749a9bed8b83aeb005cca h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ea232be86a51..c7cc216a510d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad09750b51150ca87531b8790a379214a974c167
+refs/heads/master: 1be53963b0519bd3681749a9bed8b83aeb005cca
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 4a9d763f8922..1814e68e4de3 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1840,11 +1840,6 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 
 	for (;;) {
 		struct k_sigaction *ka;
-
-		if (unlikely(signal->group_stop_count > 0) &&
-		    do_signal_stop(0))
-			goto relock;
-
 		/*
 		 * Tracing can induce an artifical signal and choose sigaction.
 		 * The return value in @signr determines the default action,
@@ -1856,6 +1851,10 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
 		if (unlikely(signr != 0))
 			ka = return_ka;
 		else {
+			if (unlikely(signal->group_stop_count > 0) &&
+			    do_signal_stop(0))
+				goto relock;
+
 			signr = dequeue_signal(current, &current->blocked,
 					       info);