2 files changed, 7 insertions, 1 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index c3831f633dec..9eb7005bc6d6 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -379,6 +379,12 @@ int event__process_mmap(event_t *self, struct perf_session *session)
 
                         session->vmlinux_maps[MAP__FUNCTION]->start = self->mmap.start;
                         session->vmlinux_maps[MAP__FUNCTION]->end   = self->mmap.start + self->mmap.len;
+                        /*
+                         * Be a bit paranoid here, some perf.data file came with
+                         * a zero sized synthesized MMAP event for the kernel.
+                         */
+                        if (session->vmlinux_maps[MAP__FUNCTION]->end == 0)
+                                session->vmlinux_maps[MAP__FUNCTION]->end = ~0UL;
 
                         perf_session__set_kallsyms_ref_reloc_sym(session, symbol_name,
                                                                  self->mmap.pgoff);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 6882e9fec2d6..ee9c37efdd36 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1937,7 +1937,7 @@ int map_groups__create_kernel_maps(struct map_groups *self,
                 return -1;
 
         if (symbol_conf.use_modules && map_groups__create_modules(self) < 0)
-                return 0;
+                pr_debug("Problems creating module maps, continuing anyway...\n");
         /*
          * Now that we have all the maps created, just set the ->end of them:
          */