From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756894AbbDWIa1 (ORCPT ); Thu, 23 Apr 2015 04:30:27 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:48872 "EHLO mx3-phx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756713AbbDWIaZ (ORCPT ); Thu, 23 Apr 2015 04:30:25 -0400 Date: Thu, 23 Apr 2015 04:30:22 -0400 (EDT) From: Ulrich Obergfell To: Andrew Morton Cc: Don Zickus , LKML Message-ID: <1728913539.5390910.1429777822876.JavaMail.zimbra@redhat.com> In-Reply-To: <20150422131201.c989c12c4ab97bec57e5c7fd@linux-foundation.org> References: <1429714069-176478-1-git-send-email-dzickus@redhat.com> <20150422131201.c989c12c4ab97bec57e5c7fd@linux-foundation.org> Subject: Re: [PATCH] watchdog: Fix watchdog_nmi_enable_all() MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.3.224.159] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF22 (Linux)/8.0.6_GA_5922) Thread-Topic: watchdog: Fix watchdog_nmi_enable_all() Thread-Index: xRCzVbyKr5K9FgMRGYHeU/BQngtbhg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > ----- Original Message ----- > From: "Andrew Morton" > To: "Don Zickus" > Cc: "LKML" , "Ulrich Obergfell" > Sent: Wednesday, April 22, 2015 10:12:01 PM > Subject: Re: [PATCH] watchdog: Fix watchdog_nmi_enable_all() > > On Wed, 22 Apr 2015 10:47:49 -0400 Don Zickus wrote: > >> From: Ulrich Obergfell >> >> 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'. > > What are the user-visible effects of the patch? Please always include > this information when fixing a bug. Andrew, this patch has no user-visible effects. The issue that is addressed by this patch came up during the recent merges. It is related to: 1) https://lkml.org/lkml/2015/2/5/624 2) http://lkml.kernel.org/r/1416251225-17721-12-git-send-email-eranian@google.com Patch series 1) changes the way how the code in kernel/watchdog.c uses certain variables such as 'watchdog_user_enabled' and it also introduces a new variable 'watchdog_enabled' as described in: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/kernel/watchdog.c?id=84d56e66b9b4a646f04ec30696ca1aeea5e654d5 This patch adjusts patch 2) which introduces watchdog_nmi_enable_all() to the new way how the code in kernel/watchdog.c should use 'watchdog_user_enabled' and 'watchdog_enabled'. Patch 2) is here: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/kernel/watchdog.c?id=b3738d29323344da3017a91010530cf3a58590fc Regards, Uli