diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-20 09:14:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-20 09:14:06 +0200 |
| commit | 275d34b82561e695339b782950d49c386169dae3 (patch) | |
| tree | 0af1bd7c6cc6d7e9723cf25feb4e99e666d16736 /tools/perf/ui | |
| parent | ce43f4fd6f103681c7485c2b1967179647e73555 (diff) | |
| parent | 74f8e22c153f4464060a0c2e4cfd1d6e51af2109 (diff) | |
| download | lwn-275d34b82561e695339b782950d49c386169dae3.tar.gz lwn-275d34b82561e695339b782950d49c386169dae3.zip | |
Merge tag 'perf-urgent-for-mingo-4.14-20171019' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
- Fix crash in perf_hpp__reset_output_field() (Jiri Olsa)
- Fix eBPF file/vendor events ambiguity in event specification (Jiri Olsa)
- Fix closing evsel fd in 'perf stat' (Jin Yao)
- Make perf test shell trace+probe_libc_inet_pton.sh pass in Debian/Ubuntu (Li Zhijian)
- Fix 'perf buildid-list --with-hits' crash when processing PERF_RECORD_NAMESPACE (Namhyung Kim)
- Fix documentation for an inexistent option 'perf record -l' (Taeung Song)
- Add long time reviewers to MAINTAINERS (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui')
| -rw-r--r-- | tools/perf/ui/hist.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index ddb2c6fbdf91..db79017a6e56 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -532,7 +532,7 @@ void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list, void perf_hpp__column_unregister(struct perf_hpp_fmt *format) { - list_del(&format->list); + list_del_init(&format->list); } void perf_hpp__cancel_cumulate(void) @@ -606,6 +606,13 @@ next: static void fmt_free(struct perf_hpp_fmt *fmt) { + /* + * At this point fmt should be completely + * unhooked, if not it's a bug. + */ + BUG_ON(!list_empty(&fmt->list)); + BUG_ON(!list_empty(&fmt->sort_list)); + if (fmt->free) fmt->free(fmt); } |