4 files changed, 23 insertions, 9 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 942f7da8bf84..ec96321eb9e4 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -193,7 +193,7 @@ static int write_padded(int fd, const void *bf, size_t count,
                         continue;               \
                 else
 
-static int __dsos__write_buildid_table(struct list_head *head, int fd)
+static int __dsos__write_buildid_table(struct list_head *head, u16 misc, int fd)
 {
         struct dso *pos;
 
@@ -205,6 +205,7 @@ static int __dsos__write_buildid_table(struct list_head *head, int fd)
                 len = ALIGN(len, NAME_ALIGN);
                 memset(&b, 0, sizeof(b));
                 memcpy(&b.build_id, pos->build_id, sizeof(pos->build_id));
+                b.header.misc = misc;
                 b.header.size = sizeof(b) + len;
                 err = do_write(fd, &b, sizeof(b));
                 if (err < 0)
@@ -220,9 +221,11 @@ static int __dsos__write_buildid_table(struct list_head *head, int fd)
 
 static int dsos__write_buildid_table(int fd)
 {
-        int err = __dsos__write_buildid_table(&dsos__kernel, fd);
+        int err = __dsos__write_buildid_table(&dsos__kernel,
+                                              PERF_RECORD_MISC_KERNEL, fd);
         if (err == 0)
-                err = __dsos__write_buildid_table(&dsos__user, fd);
+                err = __dsos__write_buildid_table(&dsos__user,
+                                                  PERF_RECORD_MISC_USER, fd);
         return err;
 }
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e0e6a075489e..378ac5422bcf 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -255,6 +255,7 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
         while (offset < limit) {
                 struct dso *dso;
                 ssize_t len;
+                struct list_head *head = &dsos__user;
 
                 if (read(input, &bev, sizeof(bev)) != sizeof(bev))
                         goto out;
@@ -263,7 +264,10 @@ int perf_header__read_build_ids(int input, u64 offset, u64 size)
                 if (read(input, filename, len) != len)
                         goto out;
 
-                dso = dsos__findnew(filename);
+                if (bev.header.misc & PERF_RECORD_MISC_KERNEL)
+                        head = &dsos__kernel;
+
+                dso = __dsos__findnew(head, filename);
                 if (dso != NULL)
                         dso__set_build_id(dso, &bev.build_id);
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index da2f07f1af8f..8e6627e6b778 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1615,14 +1615,14 @@ static struct dso *dsos__find(struct list_head *head, const char *name)
         return NULL;
 }
 
-struct dso *dsos__findnew(const char *name)
+struct dso *__dsos__findnew(struct list_head *head, const char *name)
 {
-        struct dso *dso = dsos__find(&dsos__user, name);
+        struct dso *dso = dsos__find(head, name);
 
         if (!dso) {
                 dso = dso__new(name);
                 if (dso != NULL) {
-                        dsos__add(&dsos__user, dso);
+                        dsos__add(head, dso);
                         dso__set_basename(dso);
                 }
         }
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index b2b5330a82a0..ee0b4593db7b 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -115,9 +115,17 @@ bool dso__sorted_by_name(const struct dso *self, enum map_type type);
 
 void dso__sort_by_name(struct dso *self, enum map_type type);
 
+extern struct list_head dsos__user, dsos__kernel;
+
+struct dso *__dsos__findnew(struct list_head *head, const char *name);
+
+static inline struct dso *dsos__findnew(const char *name)
+{
+        return __dsos__findnew(&dsos__user, name);
+}
+
 struct perf_session;
 
-struct dso *dsos__findnew(const char *name);
 int dso__load(struct dso *self, struct map *map, struct perf_session *session,
               symbol_filter_t filter);
 void dsos__fprintf(FILE *fp);
@@ -143,6 +151,5 @@ bool symbol_type__is_a(char symbol_type, enum map_type map_type);
 
 int perf_session__create_kernel_maps(struct perf_session *self);
 
-extern struct list_head dsos__user, dsos__kernel;
 extern struct dso *vdso;
 #endif /* __PERF_SYMBOL */