aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-10 17:37:43 +0000
committerMark Brown <broonie@linaro.org>2014-02-10 17:37:43 +0000
commit4b9c8ddadce3ec70fa5d93875adeda861b21c84e (patch)
tree6ed53e819e5c763f751ff968a650b236d2d02545 /tools
parent51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff)
parent1569265782ef26ed77ce45ebeb0676f11d4c114a (diff)
downloadlinux-linaro-stable-4b9c8ddadce3ec70fa5d93875adeda861b21c84e.tar.gz
Merge tag 'v3.10.29' into linux-linaro-lsk
This is the 3.10.29 stable release
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/session.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index cf1fe01b7e89..e392202b96bc 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -811,6 +811,7 @@ static struct machine *
union perf_event *event)
{
const u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+ struct machine *machine;
if (perf_guest &&
((cpumode == PERF_RECORD_MISC_GUEST_KERNEL) ||
@@ -822,7 +823,11 @@ static struct machine *
else
pid = event->ip.pid;
- return perf_session__findnew_machine(session, pid);
+ machine = perf_session__find_machine(session, pid);
+ if (!machine)
+ machine = perf_session__findnew_machine(session,
+ DEFAULT_GUEST_KERNEL_ID);
+ return machine;
}
return &session->machines.host;