Commit-ID: 365a4038486b57bb2bd516706a80f82f250f5306 Gitweb: http://git.kernel.org/tip/365a4038486b57bb2bd516706a80f82f250f5306 Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> AuthorDate: Mon, 21 Nov 2011 20:58:59 +0100 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 21 Dec 2011 11:01:09 +0100 perf: Fix mmap_page::offset computation There's multiple reason the counter might be unavailable, change the condition to !->index since perf_event_index() should return 0 for all those cases. Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Link: http://lkml.kernel.org/n/tip-1ixr3olci40w8rgv2evv2ldh@xxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/events/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 3894309..05affc3 100644 --- a/kernel/events/core.c +++ b/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 + -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|