diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 16:10:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 16:10:06 +0200 |
| commit | 13ead805c5a14b0e7ecd34f61404a5bfba655895 (patch) | |
| tree | 0ce86d4d10ab0398c31e5b630060309d362144d6 /kernel | |
| parent | ebf546cc5391b9a8a17c1196b05b4357ef0138a2 (diff) | |
| parent | df577149594cefacd62740e86de080c6336d699e (diff) | |
Merge branch 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull watchdog fixes from Ingo Molnar:
"Two small watchdog subsystem fixes"
* 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
watchdog: Fix print-once on enable
watchdog: Remove unnecessary header files
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/watchdog.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 7b223b212683..ff7fd80bef99 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -15,11 +15,6 @@ #include <linux/cpu.h> #include <linux/nmi.h> #include <linux/init.h> -#include <linux/delay.h> -#include <linux/freezer.h> -#include <linux/kthread.h> -#include <linux/lockdep.h> -#include <linux/notifier.h> #include <linux/module.h> #include <linux/sysctl.h> #include <linux/smpboot.h> @@ -530,7 +525,10 @@ static void watchdog_nmi_disable(unsigned int cpu) /* should be in cleanup, but blocks oprofile */ perf_event_release_kernel(event); } - return; + if (cpu == 0) { + /* watchdog_nmi_enable() expects this to be zero initially. */ + cpu0_err = 0; + } } #else static int watchdog_nmi_enable(unsigned int cpu) { return 0; } |