From ca9f295ea8619426a56d0b6048b2ccf8fd4c90ab Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 30 Apr 2008 00:53:00 -0700
Subject: [PATCH] --- yaml --- r: 95137 b: refs/heads/master c:
 53c30337f2c61aff6eecf2a446e839641172f9bd h: refs/heads/master i:   95135:
 3c51f926516f3e4d2930c9d7c67390f802d05a61 v: v3

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

diff --git a/[refs] b/[refs]
index ac0dde693650..a329dd665bed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021e1ae3d85a76ce962a300c96813f04ae50c87c
+refs/heads/master: 53c30337f2c61aff6eecf2a446e839641172f9bd
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 8423867f7d8f..251cc13720bd 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -772,13 +772,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
 	 */
 	if (legacy_queue(pending, sig))
 		return 0;
-
-	/*
-	 * Deliver the signal to listening signalfds. This must be called
-	 * with the sighand lock held.
-	 */
-	signalfd_notify(t, sig);
-
 	/*
 	 * fast-pathed signals for kernel-internal things like SIGSTOP
 	 * or SIGKILL.
@@ -828,6 +821,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
 	}
 
 out_set:
+	signalfd_notify(t, sig);
 	sigaddset(&pending->signal, sig);
 	complete_signal(sig, t, group);
 	return 0;