Re: [PATCH v2 6/6] watchdog/hardlockup: Define HARDLOCKUP_DETECTOR_ARCH

[Guenter Roeck]

On 7/1/23 09:08, Doug Anderson wrote:
> Hi,
>
> On Sat, Jul 1, 2023 at 7:40 AM Guenter Roeck <linux@xxxxxxxxxxxx> wrote:
> > On Fri, Jun 16, 2023 at 05:06:18PM +0200, Petr Mladek wrote:
> > > The HAVE_ prefix means that the code could be enabled. Add another
> > > variable for HAVE_HARDLOCKUP_DETECTOR_ARCH without this prefix.
> > > It will be set when it should be built. It will make it compatible
> > > with the other hardlockup detectors.
> > >
> > > The change allows to clean up dependencies of PPC_WATCHDOG
> > > and HAVE_HARDLOCKUP_DETECTOR_PERF definitions for powerpc.
> > >
> > > As a result HAVE_HARDLOCKUP_DETECTOR_PERF has the same dependencies
> > > on arm, x86, powerpc architectures.
> > >
> > > Signed-off-by: Petr Mladek <pmladek@xxxxxxxx>
> > > Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
> > > ---
> > ...
> > > --- a/include/linux/nmi.h
> > > +++ b/include/linux/nmi.h
> > > @@ -9,7 +9,7 @@
> > >   #include <asm/irq.h>
> > >
> > >   /* Arch specific watchdogs might need to share extra watchdog-related APIs. */
> > > -#if defined(CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)
> > > +#if defined(CONFIG_HARDLOCKUP_DETECTOR_ARCH) || defined(CONFIG_HARDLOCKUP_DETECTOR_SPARC64)
> >
> > This results in:
> >
> > arch/powerpc/platforms/pseries/mobility.c: In function 'pseries_migrate_partition':
> > arch/powerpc/platforms/pseries/mobility.c:753:17: error: implicit declaration of function 'watchdog_hardlockup_set_timeout_pct'; did you mean 'watchdog_hardlockup_stop'? [-Werror=implicit-function-declaration]
> >    753 |                 watchdog_hardlockup_set_timeout_pct(factor);
> >
> > with ppc64_defconfig -CONFIG_HARDLOCKUP_DETECTOR, because the dummy
> > for watchdog_hardlockup_set_timeout_pct() is still defined in
> > arch/powerpc/include/asm/nmi.h which is no longer included.
>
> Can you test with:
>
> https://lore.kernel.org/r/20230629124500.1.I55e2f4e7903d686c4484cb23c033c6a9e1a9d4c4@changeid

Ah, I didn't find that one. Sorry for the noise.

Yes, that should work. It is a bit odd that including both linux/nmi.h
and asm/nmi.h is required, but as it turns out that is actually quite common.

Thanks,
Guenter