Skip to content

Commit

Permalink
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history
…ux/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>
  • Loading branch information
Ingo Molnar committed Oct 24, 2014
2 parents f114040 + 9ab1f50 commit e53f612
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tools/perf/builtin-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,11 @@ static int data_init(int argc, const char **argv)

int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
{
int ret = hists__init();

if (ret < 0)
return ret;

perf_config(perf_default_config, NULL);

argc = parse_options(argc, argv, options, diff_usage, 0);
Expand Down

0 comments on commit e53f612

Please sign in to comment.