Merge tag 'trace-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

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

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 382628b9b75980e0408edeed9ecfbc2d165cd2d4..cdf5afa87f65bac9e7a51062437986b8d3fdbf99 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -33,6 +33,9 @@ config HAVE_DYNAMIC_FTRACE
 config HAVE_DYNAMIC_FTRACE_WITH_REGS
        bool
 
+config HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+       bool
+
 config HAVE_FTRACE_MCOUNT_RECORD
        bool
        help
@@ -76,7 +79,7 @@ config FTRACE_NMI_ENTER
 
 config EVENT_TRACING
        select CONTEXT_SWITCH_TRACER
-        select GLOB
+       select GLOB
        bool
 
 config CONTEXT_SWITCH_TRACER
@@ -307,7 +310,7 @@ config TRACER_SNAPSHOT
              cat snapshot
 
 config TRACER_SNAPSHOT_PER_CPU_SWAP
-        bool "Allow snapshot to swap per CPU"
+       bool "Allow snapshot to swap per CPU"
        depends on TRACER_SNAPSHOT
        select RING_BUFFER_ALLOW_SWAP
        help
@@ -556,6 +559,11 @@ config DYNAMIC_FTRACE_WITH_REGS
        depends on DYNAMIC_FTRACE
        depends on HAVE_DYNAMIC_FTRACE_WITH_REGS
 
+config DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+       def_bool y
+       depends on DYNAMIC_FTRACE
+       depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+
 config FUNCTION_PROFILER
        bool "Kernel function profiler"
        depends on FUNCTION_TRACER
@@ -674,7 +682,7 @@ config MMIOTRACE_TEST
          Say N, unless you absolutely know what you are doing.
 
 config TRACEPOINT_BENCHMARK
-        bool "Add tracepoint that benchmarks tracepoints"
+       bool "Add tracepoint that benchmarks tracepoints"
        help
         This option creates the tracepoint "benchmark:benchmark_event".
         When the tracepoint is enabled, it kicks off a kernel thread that
@@ -723,7 +731,7 @@ config RING_BUFFER_STARTUP_TEST
        bool "Ring buffer startup self test"
        depends on RING_BUFFER
        help
-         Run a simple self test on the ring buffer on boot up. Late in the
+        Run a simple self test on the ring buffer on boot up. Late in the
         kernel boot sequence, the test will start that kicks off
         a thread per cpu. Each thread will write various size events
         into the ring buffer. Another thread is created to send IPIs
@@ -751,9 +759,9 @@ config PREEMPTIRQ_DELAY_TEST
          configurable delay. The module busy waits for the duration of the
          critical section.
 
-         For example, the following invocation forces a one-time irq-disabled
-         critical section for 500us:
-         modprobe preemptirq_delay_test test_mode=irq delay=500000
+         For example, the following invocation generates a burst of three
+         irq-disabled critical sections for 500us:
+         modprobe preemptirq_delay_test test_mode=irq delay=500 burst_size=3
 
          If unsure, say N
 
@@ -762,7 +770,7 @@ config TRACE_EVAL_MAP_FILE
        depends on TRACING
        help
        The "print fmt" of the trace events will show the enum/sizeof names
-       instead of their values. This can cause problems for user space tools
+       instead of their values. This can cause problems for user space tools
        that use this string to parse the raw data as user space does not know
        how to convert the string to its value.
 
@@ -783,7 +791,7 @@ config TRACE_EVAL_MAP_FILE
        they are needed for the "eval_map" file. Enabling this option will
        increase the memory footprint of the running kernel.
 
-       If unsure, say N
+       If unsure, say N.
 
 config GCOV_PROFILE_FTRACE
        bool "Enable GCOV profiling on ftrace subsystem"