Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541AbdFQCnt (ORCPT ); Fri, 16 Jun 2017 22:43:49 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35203 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752379AbdFQCns (ORCPT ); Fri, 16 Jun 2017 22:43:48 -0400 Date: Sat, 17 Jun 2017 12:43:25 +1000 From: Nicholas Piggin To: Andrew Morton 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: <20170617124325.58ad25cb@roar.ozlabs.ibm.com> In-Reply-To: <20170616112117.a33b1096985a786777bc8b54@linux-foundation.org> References: <20170616065715.18390-1-npiggin@gmail.com> <20170616065715.18390-3-npiggin@gmail.com> <20170616112117.a33b1096985a786777bc8b54@linux-foundation.org> Organization: IBM X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; 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: 1420 Lines: 46 On Fri, 16 Jun 2017 11:21:17 -0700 Andrew Morton wrote: > 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... [snip] > > +#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? Probably not. I think it was a holdover from an earlier version where I tried to let the arch declare it (one of the little embedded ones had a comment somewhere saying it would be nice if they could make it inline). There was some difficulty with it, so yes let's remove these and do that next time. Thanks, Nick