2021-09-23 14:12:15

by Pingfan Liu

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

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 <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Wang Qing <[email protected]>
Cc: "Peter Zijlstra (Intel)" <[email protected]>
Cc: Santosh Sivaraj <[email protected]>
Cc: [email protected]
To: [email protected]
---
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)
{
hardlockup_detector_perf_enable();
- return 0;
}

void __weak watchdog_nmi_disable(unsigned int cpu)
--
2.31.1

2021-10-04 10:28:09

by Petr Mladek

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

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 <[email protected]>
> Cc: Petr Mladek <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Wang Qing <[email protected]>
> Cc: "Peter Zijlstra (Intel)" <[email protected]>
> Cc: Santosh Sivaraj <[email protected]>
> Cc: [email protected]
> To: [email protected]
> ---
> 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.

Best Regards,
Petr

2021-10-08 04:07:39

by Pingfan Liu

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

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 <[email protected]>
> > Cc: Petr Mladek <[email protected]>
> > Cc: Andrew Morton <[email protected]>
> > Cc: Wang Qing <[email protected]>
> > Cc: "Peter Zijlstra (Intel)" <[email protected]>
> > Cc: Santosh Sivaraj <[email protected]>
> > Cc: [email protected]
> > To: [email protected]
> > ---
> > 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