From: Palmer Dabbelt <[email protected]>
The variable "one_thousand" is only used under CONFIG_PERF_EVENTS=y, but
is unconditionally defined. This can fire a warning.
Signed-off-by: Palmer Dabbelt <[email protected]>
---
I went with an #ifdef instead of a __maybe_unused because that's what
the other code is using, and I left the one_thousand in order despite
that requiring another #ifdef.
---
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.32.0
On Wed, Jan 19, 2022 at 11:40:19AM -0800, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <[email protected]>
>
> The variable "one_thousand" is only used under CONFIG_PERF_EVENTS=y, but
> is unconditionally defined. This can fire a warning.
>
> Signed-off-by: Palmer Dabbelt <[email protected]>
>
> ---
>
> I went with an #ifdef instead of a __maybe_unused because that's what
> the other code is using, and I left the one_thousand in order despite
> that requiring another #ifdef.
> ---
> 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
Please use linux-next, this has changed quite a bit there.
You can git grep for SYSCTL_ONE_THOUSAND.
Luis