x86/cpu: Make sure flag_is_changeable_p() is always being used
PATCH v3 1/1 x86/cpu: Make sure flag_is_changeable_p() is always being used
When flag_is_changeable_p() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:
arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
351 | static inline int flag_is_changeable_p(u32 flag)
| ^~~~~~~~~~~~~~~~~~~~
Fix this by moving core around to make sure flag_is_changeable_p() is always being used.
See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").
---
v3: rewritten as suggested (Dave)
v2: marked both 32- and 64-bit cases
arch/x86/kernel/cpu/common.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
arch/x86/kernel/cpu/common.c +14 -17
@@ -275,22 +275,14 @@ static int __init x86_noinvpcid_setup(char *s) }early_param ("noinvpcid" , x86_noinvpcid_setup); -#ifdef CONFIG_X86_32 -static int cachesize_override =-1 ; -static int disable_x86_serial_nr =1 ; - -static int __init cachesize_setup (char *str) -{ -get_option (&str, &cachesize_override); -return 1 ; -} -__setup ("cachesize=" , cachesize_setup); -/* Standard macro to see if a specific flag is changeable */ static inline int flag_is_changeable_p (u32 flag) {u32 f1, f2; +if (!IS_ENABLED (CONFIG_X86_32 )) +return 1 ; +/* * Cyrix and IDT cpus allow disabling of CPUID * so the code below may return different results
@@ -315,6 +307,17 @@ static inline int flag_is_changeable_p(u32 flag)return ((f1^f2) & flag) !=0 ; } +#ifdef CONFIG_X86_32 +static int cachesize_override =-1 ; +static int disable_x86_serial_nr =1 ; + +static int __init cachesize_setup (char *str) +{ +get_option (&str, &cachesize_override); +return 1 ; +} +__setup ("cachesize=" , cachesize_setup); +/* Probe for the CPUID instruction */ int have_cpuid_p (void ) {
@@ -348,10 +351,6 @@ static int __init x86_serial_nr_setup(char *s) }__setup ("serialnumber" , x86_serial_nr_setup);#else -static inline int flag_is_changeable_p (u32 flag) -{ -return 1 ; -}static inline void squash_the_stupid_serial_number (struct cpuinfo_x86 *c) { }
@@ -1087,7 +1086,6 @@ void get_cpu_address_sizes(struct cpuinfo_x86 *c)static void identify_cpu_without_cpuid (struct cpuinfo_x86 *c) { -#ifdef CONFIG_X86_32 int i;/*
@@ -1108,7 +1106,6 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)break ; } } -#endif }#define NO_SPECULATION BIT(0)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 5 lines · Andy Shevchenko
When
flag_is_changeable_p()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
351 | static inline intflag_is_changeable_p(u32 flag)
Quoted 7 lines
| ^~~~~~~~~~~~~~~~~~~~Fix this by moving core around to make sure
flag_is_changeable_p()is always being used.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").
Any comments on this? Can it be applied?
Signature · 2 lines
With Best Regards, Andy Shevchenko
H. Peter Anvin
reviewerQuoted 8 lines · Andy Shevchenko
Quoted 7 lines · Andy Shevchenko
When
flag_is_changeable_p()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
351 | static inline intflag_is_changeable_p(u32 flag)| ^~~~~~~~~~~~~~~~~~~~
Quoted 8 lines
Quoted 5 lines
Fix this by moving core around to make sure
flag_is_changeable_p()is always being used.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Any comments on this? Can it be applied?
Incidentally, this really should be "unsigned long" rather than u32, although I believe it is only used on 32 bits.
Quoted 12 lines · H. Peter Anvin
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Andy Shevchenko
When
flag_is_changeable_p()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
351 | static inline intflag_is_changeable_p(u32 flag)| ^~~~~~~~~~~~~~~~~~~~Fix this by moving core around to make sure
flag_is_changeable_p()is always being used.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Any comments on this? Can it be applied?
Incidentally, this really should be "unsigned long" rather than u32, although I believe it is only used on 32 bits.
I can fix this in v4, does it warrant your Rb / Ack?
Signature · 2 lines
With Best Regards, Andy Shevchenko