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

cfd1f032 · Linus Torvalds <[email protected]> · 2012-12-06 08:27:11 -08:00

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

Commit: cfd1f032f98e5ab3a04f23a0adbd53ff8744827d
Parents: 27d7c2a0 · 8d451690

Merge commit. Changes below are compared with the first parent: 27d7c2a0.

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
kernel/watchdog.c	modified	+3	−0	View file

kernel/watchdog.c

View file

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index dd4b80a..c8c21be 100644
--- 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 */