diff --git a/[refs] b/[refs]
index 5dd7350b0a4e..b1a2e91c2c20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ed7c92d68a5387ba5f7030dc76eab03558e27f5
+refs/heads/master: acd1d7c1f8f3d848a3c5327dc09f8c1efb971678
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 0b0d5f72fe7d..0aafe85362fd 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -274,7 +274,12 @@ static void update_event_times(struct perf_event *event)
 	    event->group_leader->state < PERF_EVENT_STATE_INACTIVE)
 		return;
 
-	event->total_time_enabled = ctx->time - event->tstamp_enabled;
+	if (ctx->is_active)
+		run_end = ctx->time;
+	else
+		run_end = event->tstamp_stopped;
+
+	event->total_time_enabled = run_end - event->tstamp_enabled;
 
 	if (event->state == PERF_EVENT_STATE_INACTIVE)
 		run_end = event->tstamp_stopped;