diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 43a8d0eb5e06..020768634b29 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -96,7 +96,7 @@ static inline void hardlockup_detector_disable(void) {}
 #endif
 
 #if defined(CONFIG_HARDLOCKUP_DETECTOR)
-#ifndef CONFIG_PPC
+#ifndef CONFIG_PPC_WATCHDOG
 extern void arch_touch_nmi_watchdog(void);
 #endif
 #else
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
index a3f35067b4d0..ce26950a8140 100644
--- a/kernel/watchdog_hld.c
+++ b/kernel/watchdog_hld.c
@@ -26,8 +26,8 @@ static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
 
 static unsigned long hardlockup_allcpu_dumped;
 
-#ifndef CONFIG_PPC
-notrace void __weak arch_touch_nmi_watchdog(void)
+#ifndef CONFIG_PPC_WATCHDOG
+notrace void arch_touch_nmi_watchdog(void)
 {
 	/*
 	 * Using __raw here because some code paths have