diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index fa71aebda4ffbf0c72e2c39489c298163ed24cf0..89eadbb9cefe48fd24455c71c3ea5afaa094a655 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -473,6 +473,9 @@ static void watchdog_disable_all_cpus(void)
 {
 	int cpu;
 
+	if (no_watchdog)
+		return;
+
 	for_each_online_cpu(cpu)
 		watchdog_disable(cpu);