---

yaml --- r: 320443 b: refs/heads/master c: 7c0f4a4 h: refs/heads/master i: 320441: aac62f0 320439: 1b4cb7a v: v3
git-mirror · Jul 25, 2012 · d827f92 · d827f92
1 parent 50a7b5e
commit d827f92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)