---

yaml --- r: 288617 b: refs/heads/master c: 365a403 h: refs/heads/master i: 288615: 1d46996 v: v3
git-mirror · Dec 21, 2011 · e869159 · e869159
1 parent 7319640
commit e869159
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35edc2a5095efb189e60dc32bbb9d2663aec6d24
+refs/heads/master: 365a4038486b57bb2bd516706a80f82f250f5306
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
@@ -3268,7 +3268,7 @@ void perf_event_update_userpage(struct perf_event *event)
 	barrier();
 	userpg->index = perf_event_index(event);
 	userpg->offset = perf_event_count(event);
-	if (event->state == PERF_EVENT_STATE_ACTIVE)
+	if (userpg->index)
 		userpg->offset -= local64_read(&event->hw.prev_count);
 
 	userpg->time_enabled = enabled +