diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-02 00:24:36 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-02 00:24:36 +0300 |
| commit | 5b5e76218fbdbb71a01d5480f289ead624232876 (patch) | |
| tree | 380e6b3fade380dfb97218b44fc2aed3adffe6fe /tools/perf/builtin-annotate.c | |
| parent | 5e0f872c7d7e371fbdf09e864eddd24bddfda8fe (diff) | |
| parent | 82aa019e0098a1e0801df94345c0297448323126 (diff) | |
| download | linux-5b5e76218fbdbb71a01d5480f289ead624232876.tar.xz | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
User visible fixes:
- Show progress bar in more places while doing histogram processing
in the hists browser (Namhyung Kim)
- Print backtrace symbols when segfault occurs in 'report' (Namhyung Kim)
Infrastructure fixes:
- Append callchains only when requested (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index e7417fe97a97..747f86103599 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -232,7 +232,7 @@ static int __cmd_annotate(struct perf_annotate *ann) if (nr_samples > 0) { total_nr_samples += nr_samples; hists__collapse_resort(hists, NULL); - hists__output_resort(hists); + hists__output_resort(hists, NULL); if (symbol_conf.event_group && !perf_evsel__is_group_leader(pos)) |