2020-11-03 09:36:00

by Santosh Sivaraj

Subject: [RESEND PATCH] kernel/watchdog: Fix watchdog_allowed_mask not used warning

Define watchdog_allowed_mask only when SOFTLOCKUP_DETECTOR is enabled.

Signed-off-by: Santosh Sivaraj <[email protected]>
---

Original patch is here:
https://lore.kernel.org/lkml/[email protected]/

A similar patch was also sent by Balamuruhan and reviewed by Petr.
https://lkml.org/lkml/2020/8/20/1030

kernel/watchdog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 5abb5b22ad13..71109065bd8e 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -44,8 +44,6 @@ int __read_mostly soft_watchdog_user_enabled = 1;
int __read_mostly watchdog_thresh = 10;
static int __read_mostly nmi_watchdog_available;

-static struct cpumask watchdog_allowed_mask __read_mostly;
-
struct cpumask watchdog_cpumask __read_mostly;
unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);

@@ -162,6 +160,8 @@ static void lockup_detector_update_enable(void)
int __read_mostly sysctl_softlockup_all_cpu_backtrace;
#endif

+static struct cpumask watchdog_allowed_mask __read_mostly;
+
/* Global variables, exported for sysctl */
unsigned int __read_mostly softlockup_panic =
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;
--
2.26.2

2020-11-03 09:58:09

by Christophe Leroy

Subject: Re: [RESEND PATCH] kernel/watchdog: Fix watchdog_allowed_mask not used warning

Le 03/11/2020 à 10:32, Santosh Sivaraj a écrit :
> Define watchdog_allowed_mask only when SOFTLOCKUP_DETECTOR is enabled.
>
> Signed-off-by: Santosh Sivaraj <[email protected]>

I think maybe you should add a Fixes: tag (Towards https://github.com/linuxppc/linux/commit/7feeb9cd ?)

And copy Thomas (tglx)

Christophe

> ---
>
> Original patch is here:
> https://lore.kernel.org/lkml/[email protected]/
>
> A similar patch was also sent by Balamuruhan and reviewed by Petr.
> https://lkml.org/lkml/2020/8/20/1030
>
> kernel/watchdog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index 5abb5b22ad13..71109065bd8e 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -44,8 +44,6 @@ int __read_mostly soft_watchdog_user_enabled = 1;
> int __read_mostly watchdog_thresh = 10;
> static int __read_mostly nmi_watchdog_available;
>
> -static struct cpumask watchdog_allowed_mask __read_mostly;
> -
> struct cpumask watchdog_cpumask __read_mostly;
> unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
>
> @@ -162,6 +160,8 @@ static void lockup_detector_update_enable(void)
> int __read_mostly sysctl_softlockup_all_cpu_backtrace;
> #endif
>
> +static struct cpumask watchdog_allowed_mask __read_mostly;
> +
> /* Global variables, exported for sysctl */
> unsigned int __read_mostly softlockup_panic =
> CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;
>

2020-11-03 10:16:55

by Petr Mladek

Subject: Re: [RESEND PATCH] kernel/watchdog: Fix watchdog_allowed_mask not used warning

On Tue 2020-11-03 10:55:11, Christophe Leroy wrote:
>
>
> Le 03/11/2020 ? 10:32, Santosh Sivaraj a ?crit?:
> > Define watchdog_allowed_mask only when SOFTLOCKUP_DETECTOR is enabled.
> >
> > Signed-off-by: Santosh Sivaraj <[email protected]>
>
> I think maybe you should add a Fixes: tag (Towards https://github.com/linuxppc/linux/commit/7feeb9cd ?)
>
> And copy Thomas (tglx)

And also Andrew that usually take patches in this area.

Finally, you should add my Reviewed-by that I provided for the first
resend. Sigh, I have missed that the important people were not in CC.

Best Regards,
Petr

> Christophe
>
> > ---
> >
> > Original patch is here:
> > https://lore.kernel.org/lkml/[email protected]/
> >
> > A similar patch was also sent by Balamuruhan and reviewed by Petr.
> > https://lkml.org/lkml/2020/8/20/1030
> >
> > kernel/watchdog.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> > index 5abb5b22ad13..71109065bd8e 100644
> > --- a/kernel/watchdog.c
> > +++ b/kernel/watchdog.c
> > @@ -44,8 +44,6 @@ int __read_mostly soft_watchdog_user_enabled = 1;
> > int __read_mostly watchdog_thresh = 10;
> > static int __read_mostly nmi_watchdog_available;
> > -static struct cpumask watchdog_allowed_mask __read_mostly;
> > -
> > struct cpumask watchdog_cpumask __read_mostly;
> > unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
> > @@ -162,6 +160,8 @@ static void lockup_detector_update_enable(void)
> > int __read_mostly sysctl_softlockup_all_cpu_backtrace;
> > #endif
> > +static struct cpumask watchdog_allowed_mask __read_mostly;
> > +
> > /* Global variables, exported for sysctl */
> > unsigned int __read_mostly softlockup_panic =
> > CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;
> >