diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:12:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:12:23 -0800 |
| commit | 82c477669a4665eb4e52030792051e0559ee2a36 (patch) | |
| tree | 02542b4e7d33f157aac83f0dadc988c5d4511544 /tools/perf/util/evlist.c | |
| parent | f6d13daaddeb6e63b15a93bf36a80173bafd29bf (diff) | |
| parent | 993e5ee67a90c7b6a5dbb61b9c31df2955afff46 (diff) | |
| download | op-kernel-dev-82c477669a4665eb4e52030792051e0559ee2a36.zip op-kernel-dev-82c477669a4665eb4e52030792051e0559ee2a36.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"A handful of tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf symbols: Load map before using map->map_ip()
perf tools: Fix traceevent plugin path definitions
perf symbols: Fix JIT symbol resolution on heap
perf stat: Fix memory corruption of xyarray when cpumask is used
perf evsel: Remove duplicate member zeroing after free
perf tools: Ensure sscanf does not overrun the "mem" field
perf stat: fix NULL pointer reference bug with event unit
perf tools: Add support for the xtensa architecture
perf session: Free cpu_map in perf_session__cpu_bitmap
perf timechart: Fix wrong SVG height
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 40bd2c0..59ef280 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) |
