aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/symbol.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf/util/symbol.c')
-rw-r--r--tools/perf/util/symbol.c26
1 files changed, 4 insertions, 22 deletions
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)
53 return self->sorted_by_name & (1 << type); 53 return self->sorted_by_name & (1 << type);
54} 54}
55 55
56static void dso__set_loaded(struct dso *self, enum map_type type)
57{
58 self->loaded |= (1 << type);
59}
60
61static void dso__set_sorted_by_name(struct dso *self, enum map_type type) 56static void dso__set_sorted_by_name(struct dso *self, enum map_type type)
62{ 57{
63 self->sorted_by_name |= (1 << type); 58 self->sorted_by_name |= (1 << type);
@@ -1697,7 +1692,6 @@ out_fixup:
1697 1692
1698LIST_HEAD(dsos__user); 1693LIST_HEAD(dsos__user);
1699LIST_HEAD(dsos__kernel); 1694LIST_HEAD(dsos__kernel);
1700struct dso *vdso;
1701 1695
1702static void dsos__add(struct list_head *head, struct dso *dso) 1696static void dsos__add(struct list_head *head, struct dso *dso)
1703{ 1697{
@@ -1790,24 +1784,12 @@ static struct dso *dsos__create_kernel(const char *vmlinux)
1790{ 1784{
1791 struct dso *kernel = dso__new_kernel(vmlinux); 1785 struct dso *kernel = dso__new_kernel(vmlinux);
1792 1786
1793 if (kernel == NULL) 1787 if (kernel != NULL) {
1794 return NULL; 1788 dso__read_running_kernel_build_id(kernel);
1795 1789 dsos__add(&dsos__kernel, kernel);
1796 vdso = dso__new("[vdso]"); 1790 }
1797 if (vdso == NULL)
1798 goto out_delete_kernel_dso;
1799 dso__set_loaded(vdso, MAP__FUNCTION);
1800
1801 dso__read_running_kernel_build_id(kernel);
1802
1803 dsos__add(&dsos__kernel, kernel);
1804 dsos__add(&dsos__user, vdso);
1805 1791
1806 return kernel; 1792 return kernel;
1807
1808out_delete_kernel_dso:
1809 dso__delete(kernel);
1810 return NULL;
1811} 1793}
1812 1794
1813int __map_groups__create_kernel_maps(struct map_groups *self, 1795int __map_groups__create_kernel_maps(struct map_groups *self,