From 14eb9abe70b32690c7dcc3438fa6eb87b4b3b60a Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 1 Apr 2010 19:12:13 -0300
Subject: [PATCH] --- yaml --- r: 191167 b: refs/heads/master c:
 e727ca73f85d4c5be3547eda674168219d1c22d8 h: refs/heads/master i:   191165:
 79d9b065d0936dc95278971eeb11cc1a5d894535   191163:
 3b03c624b74ae120b6dde7df859084362fa974a8   191159:
 113132241a5676c4eaebcfebeed4d0ee8ef3af8c   191151:
 431e9197b0382e906882eb64ac6007e70974191d   191135:
 e26d797fd08cd113b1ffe40801a3847fffedb342   191103:
 7362c36bb9b54bfb7986e2578966e55944c45b2b v: v3

---
 [refs]                          | 2 +-
 trunk/tools/perf/builtin-kmem.c | 3 +++
 trunk/tools/perf/util/session.c | 5 -----
 trunk/tools/perf/util/session.h | 5 +++++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 43650afb9de8..96dc71fdf842 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e3b956a820162b7c1d616117b4f23b6017f504
+refs/heads/master: e727ca73f85d4c5be3547eda674168219d1c22d8
diff --git a/trunk/tools/perf/builtin-kmem.c b/trunk/tools/perf/builtin-kmem.c
index 32edb6a86876..7cbb5eb15101 100644
--- a/trunk/tools/perf/builtin-kmem.c
+++ b/trunk/tools/perf/builtin-kmem.c
@@ -489,6 +489,9 @@ static int __cmd_kmem(void)
 	if (session == NULL)
 		return -ENOMEM;
 
+	if (perf_session__create_kernel_maps(session) < 0)
+		goto out_delete;
+
 	if (!perf_session__has_traces(session, "kmem record"))
 		goto out_delete;
 
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
index 32765cdca058..9da5e723495c 100644
--- a/trunk/tools/perf/util/session.c
+++ b/trunk/tools/perf/util/session.c
@@ -52,11 +52,6 @@ static int perf_session__open(struct perf_session *self, bool force)
 	return -1;
 }
 
-static inline int perf_session__create_kernel_maps(struct perf_session *self)
-{
-	return map_groups__create_kernel_maps(&self->kmaps, self->vmlinux_maps);
-}
-
 struct perf_session *perf_session__new(const char *filename, int mode, bool force)
 {
 	size_t len = filename ? strlen(filename) + 1 : 0;
diff --git a/trunk/tools/perf/util/session.h b/trunk/tools/perf/util/session.h
index 6a15daeda577..dffaff52ba44 100644
--- a/trunk/tools/perf/util/session.h
+++ b/trunk/tools/perf/util/session.h
@@ -80,6 +80,11 @@ static inline int __perf_session__create_kernel_maps(struct perf_session *self,
 						self->vmlinux_maps, kernel);
 }
 
+static inline int perf_session__create_kernel_maps(struct perf_session *self)
+{
+	return map_groups__create_kernel_maps(&self->kmaps, self->vmlinux_maps);
+}
+
 static inline struct map *
 	perf_session__new_module_map(struct perf_session *self,
 				     u64 start, const char *filename)