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

torvalds · torvalds · commit cfd1f032f98e · 2012-12-06T08:27:11.000-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
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 */

Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu)`
`368`	`368`	`{`
`369`	`369`	`struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);`
`370`	`370`
	`371`	`+ if (!watchdog_enabled)`
	`372`	`+ return;`
	`373`	`+`
`371`	`374`	`watchdog_set_prio(SCHED_NORMAL, 0);`
`372`	`375`	`hrtimer_cancel(hrtimer);`
`373`	`376`	`/* disable the perf event */`