diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-23 17:43:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-23 17:43:35 +0100 |
| commit | bb236de5d9509c1c6ea5ce0680f000002e731ee2 (patch) | |
| tree | c2f97ab6907d5996d259e9f11eb6faf0456fc8ef /tools/perf/util/evlist.c | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
| parent | 578c03c86fadcc6fd7319ddf41dd4d1d88aab77a (diff) | |
| download | linux-next-bb236de5d9509c1c6ea5ce0680f000002e731ee2.tar.gz linux-next-bb236de5d9509c1c6ea5ce0680f000002e731ee2.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf tooling fixes and updates from Arnaldo Carvalho de Melo:
* Fix JIT symbol resolution on heap (Namhyung Kim)
* Fix wrong SVG height in 'timechart' (Stanislav Fomichev)
* Free temp cpu_map in perf_session__cpu_bitmap (Stanislav Fomichev)
* Fix NULL pointer reference bug with event unit in 'stat' (Stephane Eranian)
* Fix memory corruption of xyarray when cpumask is used (Stephane Eranian)
* Ensure sscanf does not overrun the "mem" field (Alan Cox)
* Add support for the xtensa architecture (Baruch Siach)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/evlist.c')
| -rw-r--r-- | tools/perf/util/evlist.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 40bd2c04df8a..59ef2802fcf6 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1003,9 +1003,12 @@ void perf_evlist__close(struct perf_evlist *evlist) struct perf_evsel *evsel; int ncpus = cpu_map__nr(evlist->cpus); int nthreads = thread_map__nr(evlist->threads); + int n; - evlist__for_each_reverse(evlist, evsel) - perf_evsel__close(evsel, ncpus, nthreads); + evlist__for_each_reverse(evlist, evsel) { + n = evsel->cpus ? evsel->cpus->nr : ncpus; + perf_evsel__close(evsel, n, nthreads); + } } int perf_evlist__open(struct perf_evlist *evlist) |