include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[mv-sheeva.git] / kernel / pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 86b3796b0436726e5b0208021cc990bfdc7044e2..a5aff94e1f0b49d30eb77ff056dd6712d5687e5e 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -13,6 +13,7 @@
 #include <linux/syscalls.h>
 #include <linux/err.h>
 #include <linux/acct.h>
+#include <linux/slab.h>
 
 #define BITS_PER_PAGE          (PAGE_SIZE*8)
 
@@ -161,13 +162,12 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
                rcu_read_lock();
 
                /*
-                * Use force_sig() since it clears SIGNAL_UNKILLABLE ensuring
-                * any nested-container's init processes don't ignore the
-                * signal
+                * 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)
-                       force_sig(SIGKILL, task);
+                       send_sig_info(SIGKILL, SEND_SIG_NOINFO, task);
 
                rcu_read_unlock();