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

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

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 434c840e2d82f64c127a5c13f1f6aa244544ed43..af7dad126c13cecbe73f5d797778f005b5838377 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -160,6 +160,17 @@ config FUNCTION_GRAPH_TRACER
          address on the current task structure into a stack of calls.
 
 
+config PREEMPTIRQ_EVENTS
+       bool "Enable trace events for preempt and irq disable/enable"
+       select TRACE_IRQFLAGS
+       depends on DEBUG_PREEMPT || !PROVE_LOCKING
+       default n
+       help
+         Enable tracing of disable and enable events for preemption and irqs.
+         For tracing preempt disable/enable events, DEBUG_PREEMPT must be
+         enabled. For tracing irq disable/enable events, PROVE_LOCKING must
+         be disabled.
+
 config IRQSOFF_TRACER
        bool "Interrupts-off Latency Tracer"
        default n
@@ -224,7 +235,7 @@ config HWLAT_TRACER
        select GENERIC_TRACER
        help
         This tracer, when enabled will create one or more kernel threads,
-        depening on what the cpumask file is set to, which each thread
+        depending on what the cpumask file is set to, which each thread
         spinning in a loop looking for interruptions caused by
         something other than the kernel. For example, if a
         System Management Interrupt (SMI) takes a noticeable amount of
@@ -239,7 +250,7 @@ config HWLAT_TRACER
                                     iteration
 
         A kernel thread is created that will spin with interrupts disabled
-        for "width" microseconds in every "widow" cycle. It will not spin
+        for "width" microseconds in every "window" cycle. It will not spin
         for "window - width" microseconds, where the system can
         continue to operate.