X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=Documentation%2Fkernel-parameters.txt;h=15356aca938cd9a7bb2cdef09d8e7a19da36db90;hb=c72bb316916b1a6cf35e1d5238566ef27b0b7f80;hp=75236f1972d98b3bb166b1d4706d7c4f74daa906;hpb=496322bc91e35007ed754184dcd447a02b6dd685;p=cascardo%2Flinux.git

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 75236f1972d9..15356aca938c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3081,6 +3081,19 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			See also Documentation/trace/ftrace.txt "trace options"
 			section.
 
+	traceoff_on_warning
+			[FTRACE] enable this option to disable tracing when a
+			warning is hit. This turns off "tracing_on". Tracing can
+			be enabled again by echoing '1' into the "tracing_on"
+			file located in /sys/kernel/debug/tracing/
+
+			This option is useful, as it disables the trace before
+			the WARNING dump is called, which prevents the trace to
+			be filled with content caused by the warning output.
+
+			This option can also be set at run time via the sysctl
+			option:  kernel/traceoff_on_warning
+
 	transparent_hugepage=
 			[KNL]
 			Format: [always|madvise|never]