Commit 8d451690 authored Dec 04, 2012 by Thomas Gleixner

watchdog: Fix CPU hotplug regression



Norbert reported:
"3.7-rc6 booted with nmi_watchdog=0 fails to suspend to RAM or
 offline CPUs. It's reproducable with a KVM guest and physical
 system."

The reason is that commit bcd951cf(watchdog: Use hotplug thread
infrastructure) missed to take this into account. So the cpu offline
code gets stuck in the teardown function because it accesses non
initialized data structures.

Add a check for watchdog_enabled into that path to cure the issue.

Reported-and-tested-by: Norbert Warmuth <nwarmuth@t-online.de>
Tested-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1211231033230.2701@ionos
Link: http://bugs.launchpad.net/bugs/1079534


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent b69f0859

kernel/watchdog.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu)
		{
		struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);

		if (!watchdog_enabled)
		return;

		watchdog_set_prio(SCHED_NORMAL, 0);
		hrtimer_cancel(hrtimer);
		/* disable the perf event */

Admin message