1 files changed, 4 insertions, 5 deletions

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index b7aade2184b..a8dd73ed158 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -69,12 +69,11 @@ void perf_session__update_sample_type(struct perf_session *self)
 
 int perf_session__create_kernel_maps(struct perf_session *self)
 {
-        int ret;
-        struct rb_root *root = &self->kerninfo_root;
+        struct rb_root *machines = &self->machines;
+        int ret = machines__create_kernel_maps(machines, HOST_KERNEL_ID);
 
-        ret = map_groups__create_kernel_maps(root, HOST_KERNEL_ID);
         if (ret >= 0)
-                ret = map_groups__create_guest_kernel_maps(root);
+                ret = machines__create_guest_kernel_maps(machines);
         return ret;
 }
 
@@ -97,7 +96,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc
         self->cwd = NULL;
         self->cwdlen = 0;
         self->unknown_events = 0;
-        self->kerninfo_root = RB_ROOT;
+        self->machines = RB_ROOT;
         self->ordered_samples.flush_limit = ULLONG_MAX;
         INIT_LIST_HEAD(&self->ordered_samples.samples_head);