diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-07 13:00:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-07 13:00:03 +0200 |
commit | 9e78874cafe3a4c52482d8c35afdec333d31e786 (patch) | |
tree | 02ec29367bc72bb1b494485a8ac44a493218d778 | |
parent | 59a5962fc722f494ca938d2bd4aed414403ae3d9 (diff) | |
parent | df577149594cefacd62740e86de080c6336d699e (diff) | |
download | tip-9e78874cafe3a4c52482d8c35afdec333d31e786.tar.gz |
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 a8d6914030fe6..8759d0b10f0bb 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; } |