Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287AbdFPSVV (ORCPT ); Fri, 16 Jun 2017 14:21:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59248 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753249AbdFPSVT (ORCPT ); Fri, 16 Jun 2017 14:21:19 -0400 Date: Fri, 16 Jun 2017 11:21:17 -0700 From: Andrew Morton To: Nicholas Piggin Cc: Don Zickus , Babu Moger , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v4 2/5] watchdog: introduce arch_touch_nmi_watchdog() Message-Id: <20170616112117.a33b1096985a786777bc8b54@linux-foundation.org> In-Reply-To: <20170616065715.18390-3-npiggin@gmail.com> References: <20170616065715.18390-1-npiggin@gmail.com> <20170616065715.18390-3-npiggin@gmail.com> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1644 Lines: 56 On Fri, 16 Jun 2017 16:57:12 +1000 Nicholas Piggin wrote: > For architectures that define HAVE_NMI_WATCHDOG, instead of having > them provide the complete touch_nmi_watchdog() function, just have > them provide arch_touch_nmi_watchdog(). > > This gives the generic code more flexibility in implementing this > function, and arch implementations don't miss out on touching the > softlockup watchdog or other generic details. > > ... > > --- a/arch/blackfin/include/asm/nmi.h > +++ b/arch/blackfin/include/asm/nmi.h > @@ -9,4 +9,6 @@ > > #include > > +extern void arch_touch_nmi_watchdog(void); Do we actually need to add this to the arch header files... > > ... > > --- a/include/linux/nmi.h > +++ b/include/linux/nmi.h > @@ -6,6 +6,9 @@ > > #include > #include > +#if defined(CONFIG_HAVE_NMI_WATCHDOG) > +#include > +#endif > > #ifdef CONFIG_LOCKUP_DETECTOR > extern void touch_softlockup_watchdog_sched(void); > @@ -58,6 +61,18 @@ static inline void reset_hung_task_detector(void) > #define NMI_WATCHDOG_ENABLED (1 << NMI_WATCHDOG_ENABLED_BIT) > #define SOFT_WATCHDOG_ENABLED (1 << SOFT_WATCHDOG_ENABLED_BIT) > > +#if defined(CONFIG_HARDLOCKUP_DETECTOR) > +extern void hardlockup_detector_disable(void); > +#else > +static inline void hardlockup_detector_disable(void) {} > +#endif > + > +#if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG) > +extern void arch_touch_nmi_watchdog(void); > +#else > +static inline void arch_touch_nmi_watchdog(void) {} > +#endif > + given that we have a global declaration here?