From c2e71d8a03b0627af166b7edaa06f2297b8069f5 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 17 May 2009 11:24:08 +0200
Subject: [PATCH] --- yaml --- r: 147470 b: refs/heads/master c:
 0203026b58b4299ba7281c0b4b417207c1f05d0e h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/kernel/exit.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 88f42f1b8715..d793f370fbe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 856d56b9e5de650a64a6c41c17aaed702b55d578
+refs/heads/master: 0203026b58b4299ba7281c0b4b417207c1f05d0e
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 16d74f13a3e7..73affd35e76d 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -128,12 +128,6 @@ static void __exit_signal(struct task_struct *tsk)
 		sig = NULL; /* Marker for below. */
 	}
 
-	/*
-	 * Flush inherited counters to the parent - before the parent
-	 * gets woken up by child-exit notifications.
-	 */
-	perf_counter_exit_task(tsk);
-
 	__unhash_process(tsk);
 
 	/*
@@ -183,6 +177,13 @@ void release_task(struct task_struct * p)
 	atomic_dec(&__task_cred(p)->user->processes);
 
 	proc_flush_task(p);
+
+	/*
+	 * Flush inherited counters to the parent - before the parent
+	 * gets woken up by child-exit notifications.
+	 */
+	perf_counter_exit_task(p);
+
 	write_lock_irq(&tasklist_lock);
 	tracehook_finish_release_task(p);
 	__exit_signal(p);