Commit cfd1f032 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu) ...@@ -368,6 +368,9 @@ static void watchdog_disable(unsigned int cpu)
{ {
struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
if (!watchdog_enabled)
return;
watchdog_set_prio(SCHED_NORMAL, 0); watchdog_set_prio(SCHED_NORMAL, 0);
hrtimer_cancel(hrtimer); hrtimer_cancel(hrtimer);
/* disable the perf event */ /* disable the perf event */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment