Merge tag 'powerpc-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 2b782321376acc9281e6e5345da06d557a3ea6a4..197545241ab835bb625ea37874e8bbd046715a84 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -46,10 +46,10 @@ config HAVE_DYNAMIC_FTRACE_WITH_ARGS
        bool
        help
         If this is set, then arguments and stack can be found from
-        the pt_regs passed into the function callback regs parameter
+        the ftrace_regs passed into the function callback regs parameter
         by default, even without setting the REGS flag in the ftrace_ops.
-        This allows for use of regs_get_kernel_argument() and
-        kernel_stack_pointer().
+        This allows for use of ftrace_regs_get_argument() and
+        ftrace_regs_get_stack_pointer().
 
 config HAVE_DYNAMIC_FTRACE_NO_PATCHABLE
        bool
@@ -382,6 +382,7 @@ config SCHED_TRACER
 config HWLAT_TRACER
        bool "Tracer to detect hardware latencies (like SMIs)"
        select GENERIC_TRACER
+       select TRACER_MAX_TRACE
        help
         This tracer, when enabled will create one or more kernel threads,
         depending on what the cpumask file is set to, which each thread
@@ -417,6 +418,7 @@ config HWLAT_TRACER
 config OSNOISE_TRACER
        bool "OS Noise tracer"
        select GENERIC_TRACER
+       select TRACER_MAX_TRACE
        help
          In the context of high-performance computing (HPC), the Operating
          System Noise (osnoise) refers to the interference experienced by an