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

diff --combined Documentation/kernel-parameters.txt
index 0293fc8daca34ab9e3055d534bcc5aebc0dc91d6,fde2ae06539adc849038895519b75923edaf3c91..31e3377d8e14862ec641930bf9f0efd6952d76dd
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -315,12 -315,12 +315,12 @@@ bytes respectively. Such letter suffixe
                        CPU-intensive style benchmark, and it can vary highly in
                        a microbenchmark depending on workload and compiler.
  
 -                      1: only for 32-bit processes
 -                      2: only for 64-bit processes
 +                      32: only for 32-bit processes
 +                      64: only for 64-bit processes
                        on: enable for both 32- and 64-bit processes
                        off: disable for both 32- and 64-bit processes
  
 -      amd_iommu=      [HW,X86-84]
 +      amd_iommu=      [HW,X86-64]
                        Pass parameters to the AMD IOMMU driver in the system.
                        Possible values are:
                        fullflush - enable flushing of IO/TLB entries when
@@@ -1888,8 -1888,6 +1888,8 @@@
                        timer: [X86] Force use of architectural NMI
                                timer mode (see also oprofile.timer
                                for generic hr timer mode)
 +                              [s390] Force legacy basic mode sampling
 +                                (report cpu_type "timer")
  
        oops=panic      Always panic on oopses. Default is to just kill the
                        process, but there is a small probability of
@@@ -2437,6 -2435,14 +2437,14 @@@
        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