perf_events: sysctl: Avoid unused one_thousand definition
Subsystems (2)
PATCH 1/1 perf_events: sysctl: Avoid unused one_thousand definition
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.
---
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(+)
kernel/sysctl.c +2 -0
@@ -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 ;
Signature · 1 line
2.32.0
Quoted 21 lines · Palmer Dabbelt
From: Palmer Dabbelt <[email protected]>
The variable "
one_thousand" is only used underCONFIG_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_unusedbecause that's what the other code is using, and I left theone_thousandin order despite that requiring another #ifdef.--- kernel/sysctl.c | 2 ++ 1 file changed, 2 insertions(+)kernel/sysctl.c +0
-0
kernel/sysctl.c static unsigned long one_ul = 1; · line 127
Quoted 6 lines
kernel/sysctl.c +2
-0@@ -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