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

Linus Torvalds committed 13 years ago

Commit cfd1f032 parents 27d7c2a 8d451691 file · +3 −0Browse files

Unified · Split

kernel/watchdog.c+3−0

@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu) · 367 unmodified lines
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 */