Merge tag 'probes-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[linux-block.git] / arch / riscv / kernel / probes / ftrace.c

diff --git a/arch/riscv/kernel/probes/ftrace.c b/arch/riscv/kernel/probes/ftrace.c
index 7142ec42e889f996fd2d0b0eb32a54fba1a89128..a69dfa610aa85724e01858cc320a55bd46298bce 100644 (file)
--- a/arch/riscv/kernel/probes/ftrace.c
+++ b/arch/riscv/kernel/probes/ftrace.c
@@ -11,6 +11,9 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
        struct kprobe_ctlblk *kcb;
        int bit;
 
+       if (unlikely(kprobe_ftrace_disabled))
+               return;
+
        bit = ftrace_test_recursion_trylock(ip, parent_ip);
        if (bit < 0)
                return;