diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-10-13 18:02:20 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-10-13 18:02:20 +0200 |
| commit | dbaa1b3d9afba3c050d365245a36616ae3f425a7 (patch) | |
| tree | 5fc6bea725975062bfa6e818205685ecf85cfb78 /tools/lib/perf | |
| parent | tools lib traceevent: Hide non API functions (diff) | |
| parent | perf stat: Fix out of bounds CPU map access when handling armv8_pmu events (diff) | |
| download | linux-dbaa1b3d9afba3c050d365245a36616ae3f425a7.tar.xz linux-dbaa1b3d9afba3c050d365245a36616ae3f425a7.zip | |
Merge branch 'perf/urgent' into perf/core
To pick fixes that missed v5.9.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib/perf')
| -rw-r--r-- | tools/lib/perf/evlist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index 2208444ecb44..cfcdbd7be066 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -45,6 +45,9 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist, if (!evsel->own_cpus || evlist->has_user_cpus) { perf_cpu_map__put(evsel->cpus); evsel->cpus = perf_cpu_map__get(evlist->cpus); + } else if (!evsel->system_wide && perf_cpu_map__empty(evlist->cpus)) { + perf_cpu_map__put(evsel->cpus); + evsel->cpus = perf_cpu_map__get(evlist->cpus); } else if (evsel->cpus != evsel->own_cpus) { perf_cpu_map__put(evsel->cpus); evsel->cpus = perf_cpu_map__get(evsel->own_cpus); |