[PATCH 1/1] sysctl: Fix 'one_thousand' defined but not used warning

[PATCH 1/1] sysctl: Fix 'one_thousand' defined but not used warning

[Suren Baghdasaryan]

Fix the following warning issued when CONFIG_PERF_EVENTS is not
defined:

kernel/sysctl.c:125:12: warning: 'one_thousand' defined but not used [-Wunused-variable]

Fixes: 39c65a94cd96 ("mm/pagealloc: sysctl: change watermark_scale_factor max limit to 30%")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 kernel/sysctl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index ef77be575d87..81a6f2d47f77 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -122,7 +122,9 @@ static unsigned long one_ul = 1;
 static unsigned long long_max = LONG_MAX;
 static int one_hundred = 100;
 static int two_hundred = 200;
+#ifdef CONFIG_PERF_EVENTS
 static int one_thousand = 1000;
+#endif
 static int three_thousand = 3000;
 #ifdef CONFIG_PRINTK
 static int ten_thousand = 10000;
-- 
2.34.1.703.g22d0c6ccf7-goog

Re: [PATCH 1/1] sysctl: Fix 'one_thousand' defined but not used warning

[Jisheng Zhang]

On Sun, Jan 16, 2022 at 05:23:17PM -0800, Suren Baghdasaryan wrote:
> Fix the following warning issued when CONFIG_PERF_EVENTS is not
> defined:
> 
> kernel/sysctl.c:125:12: warning: 'one_thousand' defined but not used [-Wunused-variable]
> 
> Fixes: 39c65a94cd96 ("mm/pagealloc: sysctl: change watermark_scale_factor max limit to 30%")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> ---
>  kernel/sysctl.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index ef77be575d87..81a6f2d47f77 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -122,7 +122,9 @@ static unsigned long one_ul = 1;
>  static unsigned long long_max = LONG_MAX;
>  static int one_hundred = 100;
>  static int two_hundred = 200;
> +#ifdef CONFIG_PERF_EVENTS
>  static int one_thousand = 1000;

what about moving one_thousand definition below to group it with
six_hundred_forty_kb var together, so that we can avoid one
#ifdef CONFIG_PERF_EVENTS ... #endif

> +#endif
>  static int three_thousand = 3000;
>  #ifdef CONFIG_PRINTK
>  static int ten_thousand = 10000;
> -- 
> 2.34.1.703.g22d0c6ccf7-goog
> 

Re: [PATCH 1/1] sysctl: Fix 'one_thousand' defined but not used warning

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]

Hi Jisheng,

On Sun, 23 Jan 2022 17:09:36 +0800 Jisheng Zhang <jszhang@kernel.org> wrote:
>
> On Sun, Jan 16, 2022 at 05:23:17PM -0800, Suren Baghdasaryan wrote:
> > Fix the following warning issued when CONFIG_PERF_EVENTS is not
> > defined:
> > 
> > kernel/sysctl.c:125:12: warning: 'one_thousand' defined but not used [-Wunused-variable]
> > 
> > Fixes: 39c65a94cd96 ("mm/pagealloc: sysctl: change watermark_scale_factor max limit to 30%")
> > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> > ---
> >  kernel/sysctl.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> > index ef77be575d87..81a6f2d47f77 100644
> > --- a/kernel/sysctl.c
> > +++ b/kernel/sysctl.c
> > @@ -122,7 +122,9 @@ static unsigned long one_ul = 1;
> >  static unsigned long long_max = LONG_MAX;
> >  static int one_hundred = 100;
> >  static int two_hundred = 200;
> > +#ifdef CONFIG_PERF_EVENTS
> >  static int one_thousand = 1000;  
> 
> what about moving one_thousand definition below to group it with
> six_hundred_forty_kb var together, so that we can avoid one
> #ifdef CONFIG_PERF_EVENTS ... #endif
> 
> > +#endif
> >  static int three_thousand = 3000;
> >  #ifdef CONFIG_PRINTK
> >  static int ten_thousand = 10000;
> > -- 
> > 2.34.1.703.g22d0c6ccf7-goog
> >   

This has been fixed in Linus' current tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]