Merge tag 'freevxfs-for-4.8' of git://git.infradead.org/users/hch/freevxfs

[deliverable/linux.git] / tools / perf / builtin-annotate.c

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index b15e7683f38c9ca27fbd0c6ca7f80c1fa3d41873..9c1034d81b4fe3cc72d4b3b09ac8d527d07b0da0 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -339,6 +339,9 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)
                    "Show event group information together"),
        OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
                    "Show a column with the sum of periods"),
+       OPT_CALLBACK_DEFAULT(0, "stdio-color", NULL, "mode",
+                            "'always' (default), 'never' or 'auto' only applicable to --stdio mode",
+                            stdio__config_color, "always"),
        OPT_END()
        };
        int ret = hists__init();