net: Fix recursive descent in __scm_destroy().

[linux-2.6-omap-h63xx.git] / kernel / pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 598f1eec9826a929e40f142b3dffe1a69d8d28e9..fab8ea86fac3f44156b0e3c50c00404080073da6 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -179,12 +179,6 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns)
                rc = sys_wait4(-1, NULL, __WALL, NULL);
        } while (rc != -ECHILD);
 
-       /*
-        * We can not clear ->child_reaper or leave it alone.
-        * There may by stealth EXIT_DEAD tasks on ->children,
-        * forget_original_parent() must move them somewhere.
-        */
-       pid_ns->child_reaper = init_pid_ns.child_reaper;
        acct_exit_ns(pid_ns);
        return;
 }