Merge remote-tracking branch 'linus/master' into testing

1 files changed, 3 insertions, 14 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 326068a593a5..a4dafbee2511 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2303,29 +2303,18 @@ int perf_session__write_header(struct perf_session *session,
         struct perf_file_header f_header;
         struct perf_file_attr   f_attr;
         struct perf_header *header = &session->header;
-        struct perf_evsel *evsel, *pair = NULL;
+        struct perf_evsel *evsel;
         int err;
 
         lseek(fd, sizeof(f_header), SEEK_SET);
 
-        if (session->evlist != evlist)
-                pair = perf_evlist__first(session->evlist);
-
         list_for_each_entry(evsel, &evlist->entries, node) {
                 evsel->id_offset = lseek(fd, 0, SEEK_CUR);
                 err = do_write(fd, evsel->id, evsel->ids * sizeof(u64));
                 if (err < 0) {
-out_err_write:
                         pr_debug("failed to write perf header\n");
                         return err;
                 }
-                if (session->evlist != evlist) {
-                        err = do_write(fd, pair->id, pair->ids * sizeof(u64));
-                        if (err < 0)
-                                goto out_err_write;
-                        evsel->ids += pair->ids;
-                        pair = perf_evsel__next(pair);
-                }
         }
 
         header->attr_offset = lseek(fd, 0, SEEK_CUR);
@@ -2391,7 +2380,6 @@ out_err_write:
         }
         lseek(fd, header->data_offset + header->data_size, SEEK_SET);
 
-        header->frozen = 1;
         return 0;
 }
 
@@ -2871,7 +2859,6 @@ int perf_session__read_header(struct perf_session *session, int fd)
                                                    session->pevent))
                 goto out_delete_evlist;
 
-        header->frozen = 1;
         return 0;
 out_errno:
         return -errno;
@@ -2969,6 +2956,8 @@ int perf_event__process_attr(union perf_event *event,
                 perf_evlist__id_add(evlist, evsel, 0, i, event->attr.id[i]);
         }
 
+        symbol_conf.nr_events = evlist->nr_entries;
+
         return 0;
 }