From 37e11d8e2c0a53273acfe759b416352f0f65693e Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 8 Apr 2009 15:01:28 +0200 Subject: [PATCH] --- yaml --- r: 147348 b: refs/heads/master c: 808382b33bb4c60df6379ec2db39f332cc56b82a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/perf_counter/kerneltop.c | 32 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 9106ed045cd2..de63b296ed4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b6e5486b3a168f0328c82a8d4376caf901472b1 +refs/heads/master: 808382b33bb4c60df6379ec2db39f332cc56b82a diff --git a/trunk/Documentation/perf_counter/kerneltop.c b/trunk/Documentation/perf_counter/kerneltop.c index 15f3a5f90198..042c1b83a872 100644 --- a/trunk/Documentation/perf_counter/kerneltop.c +++ b/trunk/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; + } } }