X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fexit.c;h=6a057750ebbbdee49b9c2c2b578567401fd8540f;hb=207bc1181b1c03ab6ecb55bca5b307606dd1d6bc;hp=af2eb3cbd499305c3d418c7f8280c2d7f0f9437d;hpb=c0a363f5cf21f79d72ab630524c3aa06fc6d066c;p=~andy%2Flinux

diff --git a/kernel/exit.c b/kernel/exit.c
index af2eb3cbd49..6a057750ebb 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -649,7 +649,6 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
 	 *	jobs, send them a SIGHUP and then a SIGCONT.  (POSIX 3.2.2.2)
 	 */
 	forget_original_parent(tsk);
-	exit_task_namespaces(tsk);
 
 	write_lock_irq(&tasklist_lock);
 	if (group_dead)
@@ -795,6 +794,7 @@ void do_exit(long code)
 	exit_shm(tsk);
 	exit_files(tsk);
 	exit_fs(tsk);
+	exit_task_namespaces(tsk);
 	exit_task_work(tsk);
 	check_stack_usage();
 	exit_thread();
@@ -835,7 +835,7 @@ void do_exit(long code)
 	/*
 	 * Make sure we are holding no locks:
 	 */
-	debug_check_no_locks_held(tsk);
+	debug_check_no_locks_held();
 	/*
 	 * We can do this unlocked here. The futex code uses this flag
 	 * just to verify whether the pi state cleanup has been done