Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9d2e5cb3a95f636f3d16bc4f419b6f60e4b49904..03d1251a915ed08091b3e619a98db45abfbd04fb 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2880,6 +2880,22 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
 
+       trace_options=[option-list]
+                       [FTRACE] Enable or disable tracer options at boot.
+                       The option-list is a comma delimited list of options
+                       that can be enabled or disabled just as if you were
+                       to echo the option name into
+
+                           /sys/kernel/debug/tracing/trace_options
+
+                       For example, to enable stacktrace option (to dump the
+                       stack trace of each event), add to the command line:
+
+                             trace_options=stacktrace
+
+                       See also Documentation/trace/ftrace.txt "trace options"
+                       section.
+
        transparent_hugepage=
                        [KNL]
                        Format: [always|madvise|never]