summaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-11 16:56:38 +0200
committerIngo Molnar <mingo@kernel.org>2016-05-11 16:56:38 +0200
commitd2950158d0d7bc376503393ca5f73f6f8d27c56b (patch)
tree7daa04400d833bd722258a49d56a39acfb392520 /tools/perf
parentea7c28518943b26a85d73cd76acd03b71962cb18 (diff)
parente9d848cb65d5f6f7731d12bd1b6d994bfdbcc94f (diff)
downloadlinux-d2950158d0d7bc376503393ca5f73f6f8d27c56b.tar.gz
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/sort.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 772e2e461ec3..20e69edd5006 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2438,6 +2438,9 @@ static char *prefix_if_not_in(const char *pre, char *str)
static char *setup_overhead(char *keys)
{
+ if (sort__mode == SORT_MODE__DIFF)
+ return keys;
+
keys = prefix_if_not_in("overhead", keys);
if (symbol_conf.cumulate_callchain)