Re: [PATCHv2 1/4] kernel/watchdog: trival cleanups

[Pingfan Liu]

On Mon, Oct 04, 2021 at 11:32:41AM +0200, Petr Mladek wrote:
> On Thu 2021-09-23 22:09:48, Pingfan Liu wrote:
> > No reference to WATCHDOG_DEFAULT, remove it.
> > 
> > And nobody cares about the return value of watchdog_nmi_enable(),
> > changing its prototype to void.
> > 
> > Signed-off-by: Pingfan Liu <kernelfans@xxxxxxxxx>
> > Cc: Petr Mladek <pmladek@xxxxxxxx>
> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> > Cc: Wang Qing <wangqing@xxxxxxxx>
> > Cc: "Peter Zijlstra (Intel)" <peterz@xxxxxxxxxxxxx>
> > Cc: Santosh Sivaraj <santosh@xxxxxxxxxx>
> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> > To: linux-kernel@xxxxxxxxxxxxxxx
> > ---
> >  include/linux/nmi.h | 2 +-
> >  kernel/watchdog.c   | 5 +----
> >  2 files changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/include/linux/nmi.h b/include/linux/nmi.h
> > index 750c7f395ca9..b7bcd63c36b4 100644
> > --- a/include/linux/nmi.h
> > +++ b/include/linux/nmi.h
> > @@ -119,7 +119,7 @@ static inline int hardlockup_detector_perf_init(void) { return 0; }
> >  void watchdog_nmi_stop(void);
> >  void watchdog_nmi_start(void);
> >  int watchdog_nmi_probe(void);
> > -int watchdog_nmi_enable(unsigned int cpu);
> > +void watchdog_nmi_enable(unsigned int cpu);
> >  void watchdog_nmi_disable(unsigned int cpu);
> >  
> >  /**
> > diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> > index ad912511a0c0..6e6dd5f0bc3e 100644
> > --- a/kernel/watchdog.c
> > +++ b/kernel/watchdog.c
> > @@ -30,10 +30,8 @@
> >  static DEFINE_MUTEX(watchdog_mutex);
> >  
> >  #if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG)
> > -# define WATCHDOG_DEFAULT	(SOFT_WATCHDOG_ENABLED | NMI_WATCHDOG_ENABLED)
> >  # define NMI_WATCHDOG_DEFAULT	1
> >  #else
> > -# define WATCHDOG_DEFAULT	(SOFT_WATCHDOG_ENABLED)
> >  # define NMI_WATCHDOG_DEFAULT	0
> >  #endif
> >  
> > @@ -95,10 +93,9 @@ __setup("nmi_watchdog=", hardlockup_panic_setup);
> >   * softlockup watchdog start and stop. The arch must select the
> >   * SOFTLOCKUP_DETECTOR Kconfig.
> >   */
> > -int __weak watchdog_nmi_enable(unsigned int cpu)
> > +void __weak watchdog_nmi_enable(unsigned int cpu)
> 
> It is __weak. spart specific implementation is in
> arch/sparc/kernel/nmi.c. It has to be updated as well.
> 
Oops, I will fix it.

Thanks,

	Pingfan