diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:34:38 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:34:38 +0100 |
commit | 9c465aceb29ae6033c9021cc38a7dd219d9edb43 (patch) | |
tree | a242be1aacad2a8e2aa45e6274f1575b4b2d7b58 /tools/perf/util/record.c | |
parent | 9547b7a4a9e1a159ceb6a79d5206b88150ffbf32 (diff) | |
parent | 57a3ca7835962109d94533465a75e8c716b26845 (diff) |
Merge tag 'v4.14.47' into linux-linaro-lsk-v4.14lsk-v4.14-18.05
This is the 4.14.47 stable release
Diffstat (limited to 'tools/perf/util/record.c')
-rw-r--r-- | tools/perf/util/record.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index 6f09e4962dad..1e97937b03a9 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -137,7 +137,6 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, struct perf_evsel *evsel; bool use_sample_identifier = false; bool use_comm_exec; - bool sample_id = opts->sample_id; /* * Set the evsel leader links before we configure attributes, @@ -164,7 +163,8 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, * match the id. */ use_sample_identifier = perf_can_sample_identifier(); - sample_id = true; + evlist__for_each_entry(evlist, evsel) + perf_evsel__set_sample_id(evsel, use_sample_identifier); } else if (evlist->nr_entries > 1) { struct perf_evsel *first = perf_evlist__first(evlist); @@ -174,10 +174,6 @@ void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts, use_sample_identifier = perf_can_sample_identifier(); break; } - sample_id = true; - } - - if (sample_id) { evlist__for_each_entry(evlist, evsel) perf_evsel__set_sample_id(evsel, use_sample_identifier); } |