2011-02-02 07:08:10

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: [tip:perf/core] perf stat: Fix up resource release order

Commit-ID: 0015e2e101f5fd3256ab8b5a374c0e8806098871
Gitweb: http://git.kernel.org/tip/0015e2e101f5fd3256ab8b5a374c0e8806098871
Author: Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 1 Feb 2011 16:18:10 -0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 1 Feb 2011 16:18:10 -0200

perf stat: Fix up resource release order

That was causing a SEGV on selected old distros.

Problem introduced in 7e2ed09.

Reported-by: Peter Zijlstra <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/builtin-stat.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index e0f9575..806a999 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -748,8 +748,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
out_free_fd:
list_for_each_entry(pos, &evsel_list->entries, node)
perf_evsel__free_stat_priv(pos);
- perf_evlist__delete(evsel_list);
-out:
perf_evlist__delete_maps(evsel_list);
+out:
+ perf_evlist__delete(evsel_list);
return status;
}