1 files changed, 9 insertions, 5 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 8b3dd467adb5..c4d55a0da2ea 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -104,12 +104,16 @@ void map__fixup_end(struct map *self)
 
 #define DSO__DELETED "(deleted)"
 
-static int map__load(struct map *self, struct perf_session *session,
-                     symbol_filter_t filter)
+int map__load(struct map *self, struct perf_session *session,
+              symbol_filter_t filter)
 {
         const char *name = self->dso->long_name;
-        int nr = dso__load(self->dso, self, session, filter);
+        int nr;
 
+        if (dso__loaded(self->dso, self->type))
+                return 0;
+
+        nr = dso__load(self->dso, self, session, filter);
         if (nr < 0) {
                 if (self->dso->has_build_id) {
                         char sbuild_id[BUILD_ID_SIZE * 2 + 1];
@@ -147,7 +151,7 @@ static int map__load(struct map *self, struct perf_session *session,
 struct symbol *map__find_symbol(struct map *self, struct perf_session *session,
                                 u64 addr, symbol_filter_t filter)
 {
-        if (!dso__loaded(self->dso, self->type) && map__load(self, session, filter) < 0)
+        if (map__load(self, session, filter) < 0)
                 return NULL;
 
         return dso__find_symbol(self->dso, self->type, addr);
@@ -157,7 +161,7 @@ struct symbol *map__find_symbol_by_name(struct map *self, const char *name,
                                         struct perf_session *session,
                                         symbol_filter_t filter)
 {
-        if (!dso__loaded(self->dso, self->type) && map__load(self, session, filter) < 0)
+        if (map__load(self, session, filter) < 0)
                 return NULL;
 
         if (!dso__sorted_by_name(self->dso, self->type))