From e86915989b3a11fa109ad67315b0dcfc5b458c19 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 21 Nov 2011 20:58:59 +0100 Subject: [PATCH] --- yaml --- r: 288617 b: refs/heads/master c: 365a4038486b57bb2bd516706a80f82f250f5306 h: refs/heads/master i: 288615: 1d4699601e3ffbc63bc8849ef3d3cc8ab93392c7 v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e1101241fbc..e50097d17218 100644 --- 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 index 3894309c41a2..05affc3878ff 100644 --- 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 +