From: Stephane Eranian Date: Tue, 14 Sep 2010 13:34:01 +0000 (+0200) Subject: watchdog: Avoid kernel crash when disabling watchdog X-Git-Tag: upstream/snapshot3+hdmi~12756^2~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9ca07a05ce1c42ac9717e54eaea4546a3a80978;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git watchdog: Avoid kernel crash when disabling watchdog In case you boot with the watchdog disabled, i.e., nowatchdog, then, if you try to disable it via /proc/sys/kernel/watchdog, you get a kernel crash. The reason is that you are trying to cancel a hrtimer which has never been initialized. This patch fixes this by skipping execution of watchdog_disable_all_cpus() when the watchdog is marked disabled from boot. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4c8f7a23.cae9d80a.2c11.0bb4@mx.google.com> Signed-off-by: Ingo Molnar --- diff --git a/kernel/watchdog.c b/kernel/watchdog.c index fa71aeb..89eadbb 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);