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 <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4c8f7a23.cae9d80a.2c11.0bb4@mx.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Stephane Eranian 2010-09-14 15:34:01 +02:00 committed by Ingo Molnar
parent 3aabae7d9d
commit d9ca07a05c
1 changed files with 3 additions and 0 deletions

View File

@ -473,6 +473,9 @@ static void watchdog_disable_all_cpus(void)
{ {
int cpu; int cpu;
if (no_watchdog)
return;
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
watchdog_disable(cpu); watchdog_disable(cpu);