diff --git a/[refs] b/[refs]
index 1be09fb4c3c6..88f42f1b8715 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bc2095951517e2c74b8aeeca4685ddd6b16ed4b
+refs/heads/master: 856d56b9e5de650a64a6c41c17aaed702b55d578
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 4741376c8dec..16d74f13a3e7 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -128,6 +128,12 @@ 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);
 
 	/*