From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753736AbbDQJY6 (ORCPT ); Fri, 17 Apr 2015 05:24:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34757 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752621AbbDQJYk (ORCPT ); Fri, 17 Apr 2015 05:24:40 -0400 From: Ulrich Obergfell To: linux-kernel@vger.kernel.org Cc: dzickus@redhat.com, uobergfe@redhat.com Subject: [RFC PATCH 1/1] watchdog: fix watchdog_nmi_enable_all() Date: Fri, 17 Apr 2015 11:26:36 +0200 Message-Id: <1429262796-3472-2-git-send-email-uobergfe@redhat.com> In-Reply-To: <1429262796-3472-1-git-send-email-uobergfe@redhat.com> References: <1429262796-3472-1-git-send-email-uobergfe@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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