2 files changed, 23 insertions, 7 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 26ec603083e0..f9049d12ead6 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1762,24 +1762,38 @@ size_t dsos__fprintf_buildid(FILE *fp, bool with_hits)
                 __dsos__fprintf_buildid(&dsos__user, fp, with_hits));
 }
 
+struct dso *dso__new_kernel(const char *name)
+{
+        struct dso *self = dso__new(name ?: "[kernel.kallsyms]");
+
+        if (self != NULL) {
+                self->short_name = "[kernel]";
+                self->kernel     = 1;
+        }
+
+        return self;
+}
+
+void dso__read_running_kernel_build_id(struct dso *self)
+{
+        if (sysfs__read_build_id("/sys/kernel/notes", self->build_id,
+                                 sizeof(self->build_id)) == 0)
+                self->has_build_id = true;
+}
+
 static struct dso *dsos__create_kernel(const char *vmlinux)
 {
-        struct dso *kernel = dso__new(vmlinux ?: "[kernel.kallsyms]");
+        struct dso *kernel = dso__new_kernel(vmlinux);
 
         if (kernel == NULL)
                 return NULL;
 
-        kernel->short_name = "[kernel]";
-        kernel->kernel     = 1;
-
         vdso = dso__new("[vdso]");
         if (vdso == NULL)
                 goto out_delete_kernel_dso;
         dso__set_loaded(vdso, MAP__FUNCTION);
 
-        if (sysfs__read_build_id("/sys/kernel/notes", kernel->build_id,
-                                 sizeof(kernel->build_id)) == 0)
-                kernel->has_build_id = true;
+        dso__read_running_kernel_build_id(kernel);
 
         dsos__add(&dsos__kernel, kernel);
         dsos__add(&dsos__user, vdso);
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index a94997aeb334..124302778c09 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -109,6 +109,7 @@ struct dso {
 };
 
 struct dso *dso__new(const char *name);
+struct dso *dso__new_kernel(const char *name);
 void dso__delete(struct dso *self);
 
 bool dso__loaded(const struct dso *self, enum map_type type);
@@ -139,6 +140,7 @@ size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp);
 char dso__symtab_origin(const struct dso *self);
 void dso__set_long_name(struct dso *self, char *name);
 void dso__set_build_id(struct dso *self, void *build_id);
+void dso__read_running_kernel_build_id(struct dso *self);
 struct symbol *dso__find_symbol(struct dso *self, enum map_type type, u64 addr);
 struct symbol *dso__find_symbol_by_name(struct dso *self, enum map_type type,
                                         const char *name);