diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-15 09:45:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-15 09:45:04 +0100 |
commit | 6a6b12e2125591e24891e6860410795ea53aed11 (patch) | |
tree | 9c186d798b75b708f663cbd286d0b842768fb873 /tools/perf/builtin-report.c | |
parent | 91a79e5fa696fa626bfbd47f827eaf3eb7d76dc5 (diff) | |
parent | fef51ecd1056b5e090c9fb73e0833bd751389572 (diff) |
Merge tag 'perf-core-for-mingo-20161114' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
New features:
- Allow querying and setting .perfconfig variables (Taeung Song)
- Show branch information in callchains (predicted, TSX aborts, loop
iteractions, etc) (Jin Yao)
Infrastructure changes:
- Support kbuild's CFLAGS_REMOVE_ in tools/build (Jiri Olsa)
- Plug building jvmti to the main perf Makefile (Jiri Olsa)
Documentation changes:
- Update Intel PT documentation about context switch events (Arnaldo Carvalho de Melo)
- Fix 'perf record --call-graph dwarf' help/config in builds not linking
with a unwind library, mentioning that is a possible record option (Rabin Vincent)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 8064de8ceedc..3dfbfffe2ecd 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -911,6 +911,9 @@ repeat: if (itrace_synth_opts.last_branch) has_br_stack = true; + if (has_br_stack && branch_call_mode) + symbol_conf.show_branchflag_count = true; + /* * Branch mode is a tristate: * -1 means default, so decide based on the file having branch data. |