From 362128b7d025f69ab2e10747ef2aa0c845d057eb Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 23 Nov 2009 11:37:26 +0100
Subject: [PATCH] --- yaml --- r: 169749 b: refs/heads/master c:
 5e942bb33371254a474653123cd9e13a4c89ee44 h: refs/heads/master i:   169747:
 0d8de96f12b72831047bf8e25e91b05c53a7c475 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/perf_event.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9319c58ac7a1..7fe05c0d7573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e2af50b1fab3c40636839a7f439c167ae559533
+refs/heads/master: 5e942bb33371254a474653123cd9e13a4c89ee44
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index fb851ec34461..8be2574b89b6 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4983,6 +4983,7 @@ void perf_event_exit_task(struct task_struct *child)
 	 * the events from it.
 	 */
 	unclone_ctx(child_ctx);
+	update_context_time(child_ctx);
 	spin_unlock_irqrestore(&child_ctx->lock, flags);
 
 	/*