summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-report.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2020-01-17 08:59:29 +0100
committerLinus Walleij <linus.walleij@linaro.org>2020-01-17 08:59:29 +0100
commit6a77de2596a8d02cbfe9cebe448d8575e4354c9a (patch)
tree13e7621c147ef1415195213089ce3c2c94590bde /tools/perf/builtin-report.c
parent59c324683400b41caa6d85b091e812ee3d5415c3 (diff)
parentb3a987b0264d3ddbb24293ebff10eddfc472f653 (diff)
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r--tools/perf/builtin-report.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 830d563de889..387311c67264 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -388,6 +388,14 @@ static int report__setup_sample_type(struct report *rep)
}
}
+ if (sort__mode == SORT_MODE__MEMORY) {
+ if (!is_pipe && !(sample_type & PERF_SAMPLE_DATA_SRC)) {
+ ui__error("Selected --mem-mode but no mem data. "
+ "Did you call perf record without -d?\n");
+ return -1;
+ }
+ }
+
if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain) {
if ((sample_type & PERF_SAMPLE_REGS_USER) &&
(sample_type & PERF_SAMPLE_STACK_USER)) {