On Fri, 16 Jun 2017 16:57:12 +1000 Nicholas Piggin <npig...@gmail.com> 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 <linux/nmi.h> > > +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 <linux/sched.h> > #include <asm/irq.h> > +#if defined(CONFIG_HAVE_NMI_WATCHDOG) > +#include <asm/nmi.h> > +#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?