2 files changed, 7 insertions, 3 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index ed558191c0b3..4af6b279e34a 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -558,13 +558,17 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
         struct map *map;
         struct kmap *kmap;
         int err;
+        union perf_event *event;
+
+        if (machine->vmlinux_maps[0] == NULL)
+                return -1;
+
         /*
          * We should get this from /sys/kernel/sections/.text, but till that is
          * available use this, and after it is use this as a fallback for older
          * kernels.
          */
-        union perf_event *event = zalloc((sizeof(event->mmap) +
-                                          machine->id_hdr_size));
+        event = zalloc((sizeof(event->mmap) + machine->id_hdr_size));
         if (event == NULL) {
                 pr_debug("Not enough memory synthesizing mmap event "
                          "for kernel modules\n");
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 6d2d50dea1d8..883406f4b381 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -119,7 +119,7 @@ struct perf_session *perf_session__new(struct perf_data_file *file,
                  * kernel MMAP event, in perf_event__process_mmap().
                  */
                 if (perf_session__create_kernel_maps(session) < 0)
-                        goto out_delete;
+                        pr_warning("Cannot read kernel map\n");
         }
 
         if (tool && tool->ordering_requires_timestamps &&