3 files changed, 15 insertions, 24 deletions

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 36ff0bf0315d..f6626cc3df2e 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -68,8 +68,13 @@ struct map *map__new(struct mmap_event *event, enum map_type type,
                 map__init(self, type, event->start, event->start + event->len,
                           event->pgoff, dso);
 
-                if (self->dso == vdso || anon)
+                if (anon) {
+set_identity:
                         self->map_ip = self->unmap_ip = identity__map_ip;
+                } else if (strcmp(filename, "[vdso]") == 0) {
+                        dso__set_loaded(dso, self->type);
+                        goto set_identity;
+                }
         }
         return self;
 out_delete:
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 051d71b33df0..e752837363ee 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -53,11 +53,6 @@ bool dso__sorted_by_name(const struct dso *self, enum map_type type)
         return self->sorted_by_name & (1 << type);
 }
 
-static void dso__set_loaded(struct dso *self, enum map_type type)
-{
-        self->loaded |= (1 << type);
-}
-
 static void dso__set_sorted_by_name(struct dso *self, enum map_type type)
 {
         self->sorted_by_name |= (1 << type);
@@ -1697,7 +1692,6 @@ out_fixup:
 
 LIST_HEAD(dsos__user);
 LIST_HEAD(dsos__kernel);
-struct dso *vdso;
 
 static void dsos__add(struct list_head *head, struct dso *dso)
 {
@@ -1790,24 +1784,12 @@ static struct dso *dsos__create_kernel(const char *vmlinux)
 {
         struct dso *kernel = dso__new_kernel(vmlinux);
 
-        if (kernel == NULL)
-                return NULL;
-
-        vdso = dso__new("[vdso]");
-        if (vdso == NULL)
-                goto out_delete_kernel_dso;
-        dso__set_loaded(vdso, MAP__FUNCTION);
-
-        dso__read_running_kernel_build_id(kernel);
-
-        dsos__add(&dsos__kernel, kernel);
-        dsos__add(&dsos__user, vdso);
+        if (kernel != NULL) {
+                dso__read_running_kernel_build_id(kernel);
+                dsos__add(&dsos__kernel, kernel);
+        }
 
         return kernel;
-
-out_delete_kernel_dso:
-        dso__delete(kernel);
-        return NULL;
 }
 
 int __map_groups__create_kernel_maps(struct map_groups *self,
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index e6a59e5c2bea..e90568a9e467 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -121,6 +121,11 @@ void dso__delete(struct dso *self);
 bool dso__loaded(const struct dso *self, enum map_type type);
 bool dso__sorted_by_name(const struct dso *self, enum map_type type);
 
+static inline void dso__set_loaded(struct dso *self, enum map_type type)
+{
+        self->loaded |= (1 << type);
+}
+
 void dso__sort_by_name(struct dso *self, enum map_type type);
 
 extern struct list_head dsos__user, dsos__kernel;
@@ -161,5 +166,4 @@ int kallsyms__parse(const char *filename, void *arg,
 int symbol__init(void);
 bool symbol_type__is_a(char symbol_type, enum map_type map_type);
 
-extern struct dso *vdso;
 #endif /* __PERF_SYMBOL */