summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/callchain.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-12-08 07:45:45 +0100
committerIngo Molnar <mingo@kernel.org>2014-12-08 07:45:45 +0100
commitcfa0bd52d0ba9b852f76c7b3f1055edd5e5c7846 (patch)
tree1076abb283310578da29e08b0eda281388ce22ea /tools/perf/util/callchain.c
parente460bfdcf3b243abebc4682d4312670a4a7dc7a4 (diff)
parent09a6a1b07e5a579ef770d9728f5b158408c73c23 (diff)
downloadlinux-cfa0bd52d0ba9b852f76c7b3f1055edd5e5c7846.tar.gz
linux-cfa0bd52d0ba9b852f76c7b3f1055edd5e5c7846.tar.bz2
linux-cfa0bd52d0ba9b852f76c7b3f1055edd5e5c7846.zip
Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements from Arnaldo Carvalho de Melo: User visible changes: - Support handling complete branch stacks as histograms (Andi Kleen) Infrastructure changes: - Prep work for supporting per-pkg and snapshot counters in 'perf stat' (Jiri Olsa) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/callchain.c')
-rw-r--r--tools/perf/util/callchain.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 517ed84db97a..cf524a35cc84 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -149,6 +149,10 @@ static int parse_callchain_sort_key(const char *value)
callchain_param.key = CCKEY_ADDRESS;
return 0;
}
+ if (!strncmp(value, "branch", strlen(value))) {
+ callchain_param.branch_callstack = 1;
+ return 0;
+ }
return -1;
}