diff options
| author | Arnaldo Carvalho de Melo | 2016-02-12 20:48:00 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2016-02-12 20:53:22 +0100 |
| commit | 682dc24c2a0f13d5a16ac8f4303671eb8f11519f (patch) | |
| tree | c5f00e75525af4da451240ec41c9fa0786e9231c /tools/perf/util/pmu.c | |
| parent | perf tools: Introduce parse_events_terms__purge() (diff) | |
| download | kernel-qcow2-linux-682dc24c2a0f13d5a16ac8f4303671eb8f11519f.tar.gz kernel-qcow2-linux-682dc24c2a0f13d5a16ac8f4303671eb8f11519f.tar.xz kernel-qcow2-linux-682dc24c2a0f13d5a16ac8f4303671eb8f11519f.zip | |
perf tools: Use perf_event_terms__purge() for non-malloced terms
In these two cases, a 'perf test' entry and in the PMU code the
list_head is on the stack, so we can't use perf_event__free_terms()
(soon to be renamed to perf_event_terms__delete()), because it will
free the list_head as well.
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/n/tip-i956ryjhz97gnnqe8iqe7m7s@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/pmu.c')
| -rw-r--r-- | tools/perf/util/pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 41a9c875e492..cf59fbaee491 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -354,7 +354,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias, list_for_each_entry(term, &alias->terms, list) { ret = parse_events_term__clone(&cloned, term); if (ret) { - parse_events__free_terms(&list); + parse_events_terms__purge(&list); return ret; } list_add_tail(&cloned->list, &list); |