X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fexit.c;h=75c05f856a5a0d00810a3301d0708e726ccd78cd;hb=8e8ece46a861c84343256819eaec77e608ff9217;hp=d27b470ec5aa69d0e211795f740e35c178542806;hpb=a6d8dea2993ef90fb69b81372daa0b63f8aa940e;p=linux-2.6.git

diff --git a/kernel/exit.c b/kernel/exit.c
index d27b470ec..75c05f856 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -27,6 +27,7 @@
 #include <linux/mempolicy.h>
 #include <linux/syscalls.h>
 #include <linux/vs_limit.h>
+#include <linux/vs_network.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -104,6 +105,8 @@ repeat:
 	release_thread(p);
 	if (p->vx_info)
 		release_vx_info(p->vx_info, p);
+	if (p->nx_info)
+		release_nx_info(p->nx_info, p);
 	put_task_struct(p);
 
 	p = leader;
@@ -526,8 +529,6 @@ static inline void choose_new_parent(task_t *p, task_t *reaper, task_t *child_re
 	 */
 	BUG_ON(p == reaper || reaper->exit_state >= EXIT_ZOMBIE);
 	p->real_parent = reaper;
-	if (p->parent == p->real_parent)
-		BUG();
 }
 
 static inline void reparent_thread(task_t *p, task_t *father, int traced)