diff options
| author | Linus Torvalds | 2012-12-06 17:27:11 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-06 17:27:11 +0100 |
| commit | cfd1f032f98e5ab3a04f23a0adbd53ff8744827d (patch) | |
| tree | eec5ef1622e29e99bc450d12ac4ccad94fc08e4a /kernel | |
| parent | vfs: clear to the end of the buffer on partial buffer reads (diff) | |
| parent | watchdog: Fix CPU hotplug regression (diff) | |
| download | kernel-qcow2-linux-cfd1f032f98e5ab3a04f23a0adbd53ff8744827d.tar.gz kernel-qcow2-linux-cfd1f032f98e5ab3a04f23a0adbd53ff8744827d.tar.xz kernel-qcow2-linux-cfd1f032f98e5ab3a04f23a0adbd53ff8744827d.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index dd4b80a9f1a9..c8c21be11ab4 100644 --- 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 */ |