Merge tag 'clang-lto-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 3985a31..61cefb1 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -538,14 +538,14 @@ config KPROBE_EVENTS
 config KPROBE_EVENTS_ON_NOTRACE
        bool "Do NOT protect notrace function from kprobe events"
        depends on KPROBE_EVENTS
-       depends on KPROBES_ON_FTRACE
+       depends on DYNAMIC_FTRACE
        default n
        help
          This is only for the developers who want to debug ftrace itself
          using kprobe events.
 
          If kprobes can use ftrace instead of breakpoint, ftrace related
-         functions are protected from kprobe-events to prevent an infinit
+         functions are protected from kprobe-events to prevent an infinite
          recursion or any unexpected execution path which leads to a kernel
          crash.
 
@@ -902,6 +902,10 @@ config PREEMPTIRQ_DELAY_TEST
          irq-disabled critical sections for 500us:
          modprobe preemptirq_delay_test test_mode=irq delay=500 burst_size=3
 
+         What's more, if you want to attach the test on the cpu which the latency
+         tracer is running on, specify cpu_affinity=cpu_num at the end of the
+         command.
+
          If unsure, say N
 
 config SYNTH_EVENT_GEN_TEST