From 72c46cb0157eda7728183c8259365f81788dccf9 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 1 Jul 2009 09:00:48 +1000 Subject: [PATCH] --- yaml --- r: 155179 b: refs/heads/master c: d8db1b57d31a6b30ea2f0df318eab50fc92b38d6 h: refs/heads/master i: 155177: 4e520a6348beec05455c4e6312206c3afdbef72e 155175: 1266f1385bcf950c32f9d4ffa3e0c24ea2c1460c v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-report.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f1efa25c61e..1747c676d852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a3393ef75a14ae259a82f3f38624efa17884168 +refs/heads/master: d8db1b57d31a6b30ea2f0df318eab50fc92b38d6 diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c index 135b7837e6bf..88e88c510ae5 100644 --- a/trunk/tools/perf/builtin-report.c +++ b/trunk/tools/perf/builtin-report.c @@ -1213,6 +1213,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) struct map *map = NULL; void *more_data = event->ip.__more_data; struct ip_callchain *chain = NULL; + int cpumode; if (sample_type & PERF_SAMPLE_PERIOD) { period = *(u64 *)more_data; @@ -1256,7 +1257,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) if (comm_list && !strlist__has_entry(comm_list, thread->comm)) return 0; - if (event->header.misc & PERF_EVENT_MISC_KERNEL) { + cpumode = event->header.misc & PERF_EVENT_MISC_CPUMODE_MASK; + + if (cpumode == PERF_EVENT_MISC_KERNEL) { show = SHOW_KERNEL; level = 'k'; @@ -1264,7 +1267,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) dprintf(" ...... dso: %s\n", dso->name); - } else if (event->header.misc & PERF_EVENT_MISC_USER) { + } else if (cpumode == PERF_EVENT_MISC_USER) { show = SHOW_USER; level = '.';