---

yaml --- r: 169722 b: refs/heads/master c: 58e5ad1 h: refs/heads/master v: v3
git-mirror · Nov 21, 2009 · 9d3eea5 · 9d3eea5
1 parent 327b65d
commit 9d3eea5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dbebf15c5d3e265f751eec72c1538a00da4be27
+refs/heads/master: 58e5ad1de3d6ad931c84f0cc8ef0655c922f30ad
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1526,10 +1526,9 @@ static void __perf_event_read(void *info)
 	if (ctx->task && cpuctx->task_ctx != ctx)
 		return;
 
-	if (ctx->is_active)
-		update_context_time(ctx);
-	event->pmu->read(event);
+	update_context_time(ctx);
 	update_event_times(event);
+	event->pmu->read(event);
 }
 
 static u64 perf_event_read(struct perf_event *event)