perf tools: Ditch record_opts.callgraph_set

We have callchain_param.enabled for that.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-silwqjc2t25ls42dsvg28pp5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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)
         perf_evlist__add(evlist, sys_enter);
         perf_evlist__add(evlist, sys_exit);
 
-        if (trace->opts.callgraph_set && !trace->kernel_syscallchains) {
+        if (callchain_param.enabled && !trace->kernel_syscallchains) {
                 /*
                  * We're interested only in the user space callchain
                  * leading to the syscall, allow overriding that for
@@ -2546,7 +2546,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
 
         perf_evlist__config(evlist, &trace->opts, NULL);
 
-        if (trace->opts.callgraph_set && trace->syscalls.events.sys_exit) {
+        if (callchain_param.enabled && trace->syscalls.events.sys_exit) {
                 perf_evsel__config_callchain(trace->syscalls.events.sys_exit,
                                              &trace->opts, &callchain_param);
                /*
@@ -3153,11 +3153,11 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
         }
 
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
-        if ((trace.min_stack || max_stack_user_set) && !trace.opts.callgraph_set)
+        if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled)
                 record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false);
 #endif
 
-        if (trace.opts.callgraph_set) {
+        if (callchain_param.enabled) {
                 if (!mmap_pages_user_set && geteuid() == 0)
                         trace.opts.mmap_pages = perf_event_mlock_kb_in_pages() * 4;