---

yaml --- r: 147470 b: refs/heads/master c: 0203026 h: refs/heads/master v: v3
git-mirror · May 17, 2009 · c2e71d8 · c2e71d8
1 parent 4c8aa89
commit c2e71d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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);