diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-10-24 03:46:36 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-10-24 03:46:36 -0400 |
commit | e53f6124af6516cee3063a3072767ee2717ff343 (patch) | |
tree | 4d5f94ca9114290dcd6d467d7548c91abbcf099c | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
parent | 9ab1f50876dbb8b962db058259be7aae920d4c25 (diff) |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo:
- Fix 'perf diff' initialization, calling the recently added hists__init()
function so that extra space is allocated per perf_evsel for the hists storage
that it also uses, just like report and top. (Kan Liang)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | tools/perf/builtin-diff.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 8c5c11ca8c53..25114c9a6801 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
@@ -1142,6 +1142,11 @@ static int data_init(int argc, const char **argv) | |||
1142 | 1142 | ||
1143 | int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) | 1143 | int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) |
1144 | { | 1144 | { |
1145 | int ret = hists__init(); | ||
1146 | |||
1147 | if (ret < 0) | ||
1148 | return ret; | ||
1149 | |||
1145 | perf_config(perf_default_config, NULL); | 1150 | perf_config(perf_default_config, NULL); |
1146 | 1151 | ||
1147 | argc = parse_options(argc, argv, options, diff_usage, 0); | 1152 | argc = parse_options(argc, argv, options, diff_usage, 0); |