projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35edc2a
)
perf: Fix mmap_page::offset computation
author
Peter Zijlstra
<a.p.zijlstra@chello.nl>
Mon, 21 Nov 2011 19:58:59 +0000
(20:58 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 21 Dec 2011 10:01:09 +0000
(11:01 +0100)
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@chello.nl>
Link:
http://lkml.kernel.org/n/tip-1ixr3olci40w8rgv2evv2ldh@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/events/core.c
patch
|
blob
|
history
diff --git
a/kernel/events/core.c
b/kernel/events/core.c
index
3894309
..
05affc3
100644
(file)
--- 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 +