diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-10-08 19:39:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-10-08 19:39:29 +0200 |
commit | 7eda0aa94db7ec94aa67b0120a10fbb84b932306 (patch) | |
tree | 99a97850d33d79769890a82e16bdcf6721727f67 | |
parent | 96b2fc09c56b3c703837ddc861dc3296453792da (diff) | |
parent | df577149594cefacd62740e86de080c6336d699e (diff) |
Merge branch 'perf/watchdog'
-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 a8d6914030fe..8759d0b10f0b 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> @@ -514,7 +509,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; } |