Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

1 files changed, 8 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0293fc8daca..31e3377d8e1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2437,6 +2437,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         stacktrace      [FTRACE]
                         Enabled the stack tracer on boot up.
 
+        stacktrace_filter=[function-list]
+                        [FTRACE] Limit the functions that the stack tracer
+                        will trace at boot up. function-list is a comma separated
+                        list of functions. This list can be changed at run
+                        time by the stack_trace_filter file in the debugfs
+                        tracing directory. Note, this enables stack tracing
+                        and the stacktrace above is not needed.
+
         sti=            [PARISC,HW]
                         Format: <num>
                         Set the STI (builtin display/keyboard on the HP-PARISC