summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-05-10 12:51:05 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-05-10 12:51:05 -0300
commitd118f8ba6ac2af2bf11d40cba657c813f0f39ca2 (patch)
tree3df771498254ed1e6ed374031cd32e7f4e51e753
parentcdd5b75b0cd24c4d6a98b12a219217b1ccfe2586 (diff)
downloadlinux-d118f8ba6ac2af2bf11d40cba657c813f0f39ca2.tar.gz
linux-d118f8ba6ac2af2bf11d40cba657c813f0f39ca2.tar.bz2
linux-d118f8ba6ac2af2bf11d40cba657c813f0f39ca2.zip
perf session: create_kernel_maps should use ->host_machine
Using machines__create_kernel_maps(..., HOST_KERNEL_ID) it would create another machine instance for the host machine, and since 1f626bc we have it out of the machines rb_tree. Fix it by using machine__create_kernel_maps(&self->host_machine) directly. Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/session.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index c088d8f9b51c..4130036a0109 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -69,11 +69,10 @@ void perf_session__update_sample_type(struct perf_session *self)
int perf_session__create_kernel_maps(struct perf_session *self)
{
- struct rb_root *machines = &self->machines;
- int ret = machines__create_kernel_maps(machines, HOST_KERNEL_ID);
+ int ret = machine__create_kernel_maps(&self->host_machine);
if (ret >= 0)
- ret = machines__create_guest_kernel_maps(machines);
+ ret = machines__create_guest_kernel_maps(&self->machines);
return ret;
}