From d827f9272ae93bcaa9569c558fc8536402944564 Mon Sep 17 00:00:00 2001 From: David Ahern Date: Fri, 20 Jul 2012 17:25:48 -0600 Subject: [PATCH] --- yaml --- r: 320443 b: refs/heads/master c: 7c0f4a4113ba5de7898c246eeaeee4c23d94b887 h: refs/heads/master i: 320441: aac62f0b0dc0c806a0afc900324f627b0058a791 320439: 1b4cb7a8522fac6cba1dd0b2f0c839e902b9a246 v: v3 --- [refs] | 2 +- trunk/tools/perf/util/session.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba607e2ef5ef..60ee9323e9c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cd95c2db479aa7a66f6fa572dfa410c6314c78e +refs/heads/master: 7c0f4a4113ba5de7898c246eeaeee4c23d94b887 diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c index 8e485592ca20..90ee39dd8ab2 100644 --- a/trunk/tools/perf/util/session.c +++ b/trunk/tools/perf/util/session.c @@ -918,7 +918,9 @@ static struct machine * { const u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK; - if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { + if (perf_guest && + ((cpumode == PERF_RECORD_MISC_GUEST_KERNEL) || + (cpumode == PERF_RECORD_MISC_GUEST_USER))) { u32 pid; if (event->header.type == PERF_RECORD_MMAP)