From 521034e8ea81409898c55f51780ab100c95889f5 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Fri, 23 Mar 2012 15:02:46 -0700
Subject: [PATCH] --- yaml --- r: 295266 b: refs/heads/master c:
 a02d6fd643cbd4c559113b35b31d3b04e4ec60c7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 20bfbd040cd2..2d510b344549 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d393099de21eda91c5ec6a05d60e5dee4d5175
+refs/heads/master: a02d6fd643cbd4c559113b35b31d3b04e4ec60c7
diff --git a/trunk/kernel/pid_namespace.c b/trunk/kernel/pid_namespace.c
index a8968396046d..17b232869a04 100644
--- a/trunk/kernel/pid_namespace.c
+++ b/trunk/kernel/pid_namespace.c
@@ -168,13 +168,9 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
 	while (nr > 0) {
 		rcu_read_lock();
 
-		/*
-		 * Any nested-container's init processes won't ignore the
-		 * SEND_SIG_NOINFO signal, see send_signal()->si_fromuser().
-		 */
 		task = pid_task(find_vpid(nr), PIDTYPE_PID);
-		if (task)
-			send_sig_info(SIGKILL, SEND_SIG_NOINFO, task);
+		if (task && !__fatal_signal_pending(task))
+			send_sig_info(SIGKILL, SEND_SIG_FORCED, task);
 
 		rcu_read_unlock();