---

yaml --- r: 232766 b: refs/heads/master c: 542e72f h: refs/heads/master v: v3
git-mirror · Feb 3, 2011 · 4ef3d0a · 4ef3d0a
1 parent b05baff
commit 4ef3d0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ffdc6c37df131f89d52001e0ef03091b158826f
+refs/heads/master: 542e72fc90f5ed9eecb574f80f70868c7f296093
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1901,11 +1901,12 @@ static void __perf_event_read(void *info)
 		return;
 
 	raw_spin_lock(&ctx->lock);
-	update_context_time(ctx);
+	if (ctx->is_active)
+		update_context_time(ctx);
 	update_event_times(event);
+	if (event->state == PERF_EVENT_STATE_ACTIVE)
+		event->pmu->read(event);
 	raw_spin_unlock(&ctx->lock);
-
-	event->pmu->read(event);
 }
 
 static inline u64 perf_event_count(struct perf_event *event)