Commit cfd1f032 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 27d7c2a0 8d451690

kernel/watchdog.c

+3 −0
Original line number Diff line number Diff line
@@ -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 */