diff --git a/arch/arm64/include/asm/nmi.h b/arch/arm64/include/asm/nmi.h
new file mode 100644
index 0000000000000000000000000000000000000000..b9258085ac134c7fe1fc1b4815be49bc5b5d0410
--- /dev/null
+++ b/arch/arm64/include/asm/nmi.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#if !defined(CONFIG_HARDLOCKUP_DETECTOR)
+static inline void arch_touch_nmi_watchdog(void) { }
+#endif
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 5e1facadc0aa49e23757ffc89030877c00ab5aec..84f324d65068be036cc397866c19911427a73d55 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -7,7 +7,7 @@
 
 #include <linux/sched.h>
 #include <asm/irq.h>
-#if defined(CONFIG_HAVE_NMI_WATCHDOG) && !defined(CONFIG_SDEI_WATCHDOG)
+#if defined(CONFIG_HAVE_NMI_WATCHDOG)
 #include <asm/nmi.h>
 #endif
 
@@ -87,6 +87,7 @@ extern void watchdog_hardlockup_check(struct pt_regs *regs);
 extern unsigned int hardlockup_panic;
 #else
 static inline void hardlockup_detector_disable(void) {}
+static inline void watchdog_hardlockup_check(struct pt_regs *regs) {}
 #endif
 
 #if defined(CONFIG_HAVE_NMI_WATCHDOG) || defined(CONFIG_HARDLOCKUP_DETECTOR)