Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

[linux-2.6] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 741bbe42dfe8a5e2ceae75ed4bb57c7b4bf4a136..06de6c4e8ca3a66937ce8763d33ca42852fbb698 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -128,6 +128,7 @@ static void __exit_signal(struct task_struct *tsk)
        flush_sigqueue(&tsk->pending);
        if (sig) {
                flush_sigqueue(&sig->shared_pending);
+               taskstats_tgid_free(sig);
                __cleanup_signal(sig);
        }
 }
@@ -920,7 +921,6 @@ fastcall NORET_TYPE void do_exit(long code)
        exit_sem(tsk);
        __exit_files(tsk);
        __exit_fs(tsk);
-       exit_task_namespaces(tsk);
        exit_thread();
        cpuset_exit(tsk);
        exit_keys(tsk);
@@ -935,6 +935,7 @@ fastcall NORET_TYPE void do_exit(long code)
        tsk->exit_code = code;
        proc_exit_connector(tsk);
        exit_notify(tsk);
+       exit_task_namespaces(tsk);
 #ifdef CONFIG_NUMA
        mpol_free(tsk->mempolicy);
        tsk->mempolicy = NULL;