summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-04-08 15:01:28 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-08 18:53:29 +0200
commit808382b33bb4c60df6379ec2db39f332cc56b82a (patch)
treea3f201053f207f52df368371c4815f6a1fdf85c0
parent6b6e5486b3a168f0328c82a8d4376caf901472b1 (diff)
downloadblackbird-op-linux-808382b33bb4c60df6379ec2db39f332cc56b82a.tar.gz
blackbird-op-linux-808382b33bb4c60df6379ec2db39f332cc56b82a.zip
perf_counter: kerneltop: keep up with ABI changes
Update kerneltop to use PERF_EVENT_MISC_OVERFLOW Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> LKML-Reference: <20090408130408.947197470@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--Documentation/perf_counter/kerneltop.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/Documentation/perf_counter/kerneltop.c b/Documentation/perf_counter/kerneltop.c
index 15f3a5f90198..042c1b83a872 100644
--- a/Documentation/perf_counter/kerneltop.c
+++ b/Documentation/perf_counter/kerneltop.c
@@ -1277,22 +1277,22 @@ static void mmap_read(struct mmap_data *md)
old += size;
- switch (event->header.type) {
- case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP:
- case PERF_EVENT_COUNTER_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID:
- process_event(event->ip.ip, md->counter);
- break;
-
- case PERF_EVENT_MMAP:
- case PERF_EVENT_MUNMAP:
- printf("%s: %Lu %Lu %Lu %s\n",
- event->header.type == PERF_EVENT_MMAP
- ? "mmap" : "munmap",
- event->mmap.start,
- event->mmap.len,
- event->mmap.pgoff,
- event->mmap.filename);
- break;
+ if (event->header.misc & PERF_EVENT_MISC_OVERFLOW) {
+ if (event->header.type & PERF_RECORD_IP)
+ process_event(event->ip.ip, md->counter);
+ } else {
+ switch (event->header.type) {
+ case PERF_EVENT_MMAP:
+ case PERF_EVENT_MUNMAP:
+ printf("%s: %Lu %Lu %Lu %s\n",
+ event->header.type == PERF_EVENT_MMAP
+ ? "mmap" : "munmap",
+ event->mmap.start,
+ event->mmap.len,
+ event->mmap.pgoff,
+ event->mmap.filename);
+ break;
+ }
}
}
OpenPOWER on IntegriCloud