Messages in this thread Patch in this message | | | From | Ulrich Obergfell <> | Subject | [RFC PATCH 1/1] watchdog: fix watchdog_nmi_enable_all() | Date | Fri, 17 Apr 2015 11:26:36 +0200 |
| |
The 'watchdog_user_enabled' variable is only used as an 'interface' to the /proc/sys/kernel/watchdog parameter. The actual state of the watchdog is tracked by bits in the 'watchdog_enabled' variable. So, watchdog_nmi_enable_all() should check the NMI_WATCHDOG_ENABLED bit in 'watchdog_enabled'.
Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com> --- kernel/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 2316f50..cba2110 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -608,7 +608,7 @@ void watchdog_nmi_enable_all(void) { int cpu; - if (!watchdog_user_enabled) + if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED)) return; get_online_cpus(); -- 1.7.11.7
| |