core regression fix for 3.7

Linus,

please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

* Trivial CPU hotplug regression fix for the watchdog code.

Thanks,

tglx

------------------>
Thomas Gleixner (1):
watchdog: Fix CPU hotplug regression

 kernel/watchdog.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index dd4b80a..c8c21be 100644
@@ -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 */