1 files changed, 39 insertions, 20 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 158c787ce0c4..26f5b2fe5dc8 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -214,11 +214,11 @@ static int machine__hit_all_dsos(struct machine *machine)
 {
         int err;
 
-        err = __dsos__hit_all(&machine->kernel_dsos);
+        err = __dsos__hit_all(&machine->kernel_dsos.head);
         if (err)
                 return err;
 
-        return __dsos__hit_all(&machine->user_dsos);
+        return __dsos__hit_all(&machine->user_dsos.head);
 }
 
 int dsos__hit_all(struct perf_session *session)
@@ -288,11 +288,12 @@ static int machine__write_buildid_table(struct machine *machine, int fd)
                 umisc = PERF_RECORD_MISC_GUEST_USER;
         }
 
-        err = __dsos__write_buildid_table(&machine->kernel_dsos, machine,
+        err = __dsos__write_buildid_table(&machine->kernel_dsos.head, machine,
                                           machine->pid, kmisc, fd);
         if (err == 0)
-                err = __dsos__write_buildid_table(&machine->user_dsos, machine,
-                                                  machine->pid, umisc, fd);
+                err = __dsos__write_buildid_table(&machine->user_dsos.head,
+                                                  machine, machine->pid, umisc,
+                                                  fd);
         return err;
 }
 
@@ -455,9 +456,10 @@ static int __dsos__cache_build_ids(struct list_head *head,
 
 static int machine__cache_build_ids(struct machine *machine, const char *debugdir)
 {
-        int ret = __dsos__cache_build_ids(&machine->kernel_dsos, machine,
+        int ret = __dsos__cache_build_ids(&machine->kernel_dsos.head, machine,
                                           debugdir);
-        ret |= __dsos__cache_build_ids(&machine->user_dsos, machine, debugdir);
+        ret |= __dsos__cache_build_ids(&machine->user_dsos.head, machine,
+                                       debugdir);
         return ret;
 }
 
@@ -483,8 +485,10 @@ static int perf_session__cache_build_ids(struct perf_session *session)
 
 static bool machine__read_build_ids(struct machine *machine, bool with_hits)
 {
-        bool ret = __dsos__read_build_ids(&machine->kernel_dsos, with_hits);
-        ret |= __dsos__read_build_ids(&machine->user_dsos, with_hits);
+        bool ret;
+
+        ret  = __dsos__read_build_ids(&machine->kernel_dsos.head, with_hits);
+        ret |= __dsos__read_build_ids(&machine->user_dsos.head, with_hits);
         return ret;
 }
 
@@ -575,16 +579,12 @@ static int write_version(int fd, struct perf_header *h __maybe_unused,
         return do_write_string(fd, perf_version_string);
 }
 
-static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
-                       struct perf_evlist *evlist __maybe_unused)
+static int __write_cpudesc(int fd, const char *cpuinfo_proc)
 {
-#ifndef CPUINFO_PROC
-#define CPUINFO_PROC NULL
-#endif
         FILE *file;
         char *buf = NULL;
         char *s, *p;
-        const char *search = CPUINFO_PROC;
+        const char *search = cpuinfo_proc;
         size_t len = 0;
         int ret = -1;
 
@@ -634,6 +634,25 @@ done:
         return ret;
 }
 
+static int write_cpudesc(int fd, struct perf_header *h __maybe_unused,
+                       struct perf_evlist *evlist __maybe_unused)
+{
+#ifndef CPUINFO_PROC
+#define CPUINFO_PROC {"model name", }
+#endif
+        const char *cpuinfo_procs[] = CPUINFO_PROC;
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) {
+                int ret;
+                ret = __write_cpudesc(fd, cpuinfo_procs[i]);
+                if (ret >= 0)
+                        return ret;
+        }
+        return -1;
+}
+
+
 static int write_nrcpus(int fd, struct perf_header *h __maybe_unused,
                         struct perf_evlist *evlist __maybe_unused)
 {
@@ -1548,7 +1567,7 @@ static int __event_process_build_id(struct build_id_event *bev,
                                     struct perf_session *session)
 {
         int err = -1;
-        struct list_head *head;
+        struct dsos *dsos;
         struct machine *machine;
         u16 misc;
         struct dso *dso;
@@ -1563,22 +1582,22 @@ static int __event_process_build_id(struct build_id_event *bev,
         switch (misc) {
         case PERF_RECORD_MISC_KERNEL:
                 dso_type = DSO_TYPE_KERNEL;
-                head = &machine->kernel_dsos;
+                dsos = &machine->kernel_dsos;
                 break;
         case PERF_RECORD_MISC_GUEST_KERNEL:
                 dso_type = DSO_TYPE_GUEST_KERNEL;
-                head = &machine->kernel_dsos;
+                dsos = &machine->kernel_dsos;
                 break;
         case PERF_RECORD_MISC_USER:
         case PERF_RECORD_MISC_GUEST_USER:
                 dso_type = DSO_TYPE_USER;
-                head = &machine->user_dsos;
+                dsos = &machine->user_dsos;
                 break;
         default:
                 goto out;
         }
 
-        dso = __dsos__findnew(head, filename);
+        dso = __dsos__findnew(dsos, filename);
         if (dso != NULL) {
                 char sbuild_id[BUILD_ID_SIZE * 2 + 1];