diff options
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r-- | tools/perf/builtin-trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 0e3c1cecef1b..5e2614bbb48d 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -2457,7 +2457,7 @@ static int trace__add_syscall_newtp(struct trace *trace) | |||
2457 | perf_evlist__add(evlist, sys_enter); | 2457 | perf_evlist__add(evlist, sys_enter); |
2458 | perf_evlist__add(evlist, sys_exit); | 2458 | perf_evlist__add(evlist, sys_exit); |
2459 | 2459 | ||
2460 | if (trace->opts.callgraph_set && !trace->kernel_syscallchains) { | 2460 | if (callchain_param.enabled && !trace->kernel_syscallchains) { |
2461 | /* | 2461 | /* |
2462 | * We're interested only in the user space callchain | 2462 | * We're interested only in the user space callchain |
2463 | * leading to the syscall, allow overriding that for | 2463 | * leading to the syscall, allow overriding that for |
@@ -2546,7 +2546,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) | |||
2546 | 2546 | ||
2547 | perf_evlist__config(evlist, &trace->opts, NULL); | 2547 | perf_evlist__config(evlist, &trace->opts, NULL); |
2548 | 2548 | ||
2549 | if (trace->opts.callgraph_set && trace->syscalls.events.sys_exit) { | 2549 | if (callchain_param.enabled && trace->syscalls.events.sys_exit) { |
2550 | perf_evsel__config_callchain(trace->syscalls.events.sys_exit, | 2550 | perf_evsel__config_callchain(trace->syscalls.events.sys_exit, |
2551 | &trace->opts, &callchain_param); | 2551 | &trace->opts, &callchain_param); |
2552 | /* | 2552 | /* |
@@ -3153,11 +3153,11 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) | |||
3153 | } | 3153 | } |
3154 | 3154 | ||
3155 | #ifdef HAVE_DWARF_UNWIND_SUPPORT | 3155 | #ifdef HAVE_DWARF_UNWIND_SUPPORT |
3156 | if ((trace.min_stack || max_stack_user_set) && !trace.opts.callgraph_set) | 3156 | if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled) |
3157 | record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false); | 3157 | record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false); |
3158 | #endif | 3158 | #endif |
3159 | 3159 | ||
3160 | if (trace.opts.callgraph_set) { | 3160 | if (callchain_param.enabled) { |
3161 | if (!mmap_pages_user_set && geteuid() == 0) | 3161 | if (!mmap_pages_user_set && geteuid() == 0) |
3162 | trace.opts.mmap_pages = perf_event_mlock_kb_in_pages() * 4; | 3162 | trace.opts.mmap_pages = perf_event_mlock_kb_in_pages() * 4; |
3163 | 3163 | ||