diff --git a/arch/arm64/kernel/watchdog_sdei.c b/arch/arm64/kernel/watchdog_sdei.c
index c342f86560d530790cbb92848c3d03de8da8ed89..6352b589e02ab892eca63d3dc5cdbf5a1332e1c5 100644
--- a/arch/arm64/kernel/watchdog_sdei.c
+++ b/arch/arm64/kernel/watchdog_sdei.c
@@ -14,6 +14,7 @@
 #include <asm/sdei.h>
 #include <asm/virt.h>
 #include <linux/arm_sdei.h>
+#include <linux/kprobes.h>
 #include <linux/nmi.h>
 
 /* We use the secure physical timer as SDEI NMI watchdog timer */
@@ -66,6 +67,7 @@ static int sdei_watchdog_callback(u32 event,
 
 	return 0;
 }
+NOKPROBE_SYMBOL(sdei_watchdog_callback);
 
 static void sdei_nmi_watchdog_bind(void *data)
 {
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index bbc4940f21af617470b932189703685e7097c322..1857d98ebe07c2fc557b57c4b3f8c759cefe36a5 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -16,6 +16,7 @@
 #include <linux/cpu.h>
 #include <linux/nmi.h>
 #include <linux/init.h>
+#include <linux/kprobes.h>
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/tick.h>
@@ -324,6 +325,7 @@ bool is_hardlockup(void)
 	__this_cpu_write(hrtimer_interrupts_saved, hrint);
 	return false;
 }
+NOKPROBE_SYMBOL(is_hardlockup);
 
 static void watchdog_interrupt_count(void)
 {
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
index aaa08dad884f95c59890e3dd5752d61c94619cd1..904a95262fcf63a868780b5fe742300a686f4d2e 100644
--- a/kernel/watchdog_hld.c
+++ b/kernel/watchdog_hld.c
@@ -14,6 +14,7 @@
 
 #include <linux/nmi.h>
 #include <linux/atomic.h>
+#include <linux/kprobes.h>
 #include <linux/module.h>
 #include <linux/sched/debug.h>
 
@@ -152,6 +153,7 @@ void watchdog_hardlockup_check(struct pt_regs *regs)
 	__this_cpu_write(hard_watchdog_warn, false);
 	return;
 }
+NOKPROBE_SYMBOL(watchdog_hardlockup_check);
 
 #ifdef CONFIG_HARDLOCKUP_DETECTOR_PERF
 static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 5f8d154a2cf9d977de090342423149612eac53ec..1e5291aa9643a6c577787f219cc7bdd29f417990 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -843,7 +843,7 @@ choice
 
 config SDEI_WATCHDOG
 	bool "SDEI NMI Watchdog support"
-	depends on ARM_SDE_INTERFACE
+	depends on ARM_SDE_INTERFACE && !HARDLOCKUP_CHECK_TIMESTAMP
 	select HAVE_HARDLOCKUP_DETECTOR_ARCH
 
 config PMU_WATCHDOG