diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
| commit | cf36ae3e5802716617b9e4d902a31048240396b0 (patch) | |
| tree | 2729abc9dae00a6ae10608fbd80bef8335442ed2 /tools/perf/builtin-annotate.c | |
| parent | 82a1356a933d8443139f8886f11b63c974a09a67 (diff) | |
| parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging for v6.0-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 2ffe071dbcff..f839e69492e8 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -50,7 +50,9 @@ struct perf_annotate { bool use_tui; #endif bool use_stdio, use_stdio2; +#ifdef HAVE_GTK2_SUPPORT bool use_gtk; +#endif bool skip_missing; bool has_br_stack; bool group_set; @@ -526,7 +528,9 @@ int cmd_annotate(int argc, const char **argv) OPT_BOOLEAN('q', "quiet", &quiet, "do now show any message"), OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), +#ifdef HAVE_GTK2_SUPPORT OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"), +#endif #ifdef HAVE_SLANG_SUPPORT OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"), #endif @@ -614,10 +618,12 @@ int cmd_annotate(int argc, const char **argv) if (annotate_check_args(&annotate.opts) < 0) return -EINVAL; +#ifdef HAVE_GTK2_SUPPORT if (symbol_conf.show_nr_samples && annotate.use_gtk) { pr_err("--show-nr-samples is not available in --gtk mode at this time\n"); return ret; } +#endif ret = symbol__validate_sym_arguments(); if (ret) @@ -656,8 +662,10 @@ int cmd_annotate(int argc, const char **argv) else if (annotate.use_tui) use_browser = 1; #endif +#ifdef HAVE_GTK2_SUPPORT else if (annotate.use_gtk) use_browser = 2; +#endif setup_browser(true); |