Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/…

…linux/kernel/git/tip/tip Pull watchdog fix from Thomas Gleixner: "Trivial CPU hotplug regression fix for the watchdog code" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: watchdog: Fix CPU hotplug regression
mariux64 · Dec 6, 2012 · cfd1f03 · cfd1f03
2 parents 27d7c2a + 8d45169
commit cfd1f03
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
@@ -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 */