Skip to contentSkip to conversation

x86/cpu: Mark flag_is_changeable_p() with __maybe_unused

PATCH In review Andy Shevchenko 2 participants 3 messages Sep 5, 2024 – Sep 9, 2024 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/cpu: Mark flag_is_changeable_p() with __maybe_unused

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 marking it with __maybe_unused (both cases for the sake of symmetry).

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").

---
v2: marked both 32- and 64-bit cases

 arch/x86/kernel/cpu/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/common.c +2 -2
index d4e539d4e158..4b35744ef9b2 100644
@@ -287,7 +287,7 @@ static int __init cachesize_setup(char *str)
 __setup("cachesize=", cachesize_setup);
 
 /* Standard macro to see if a specific flag is changeable */
-static inline int flag_is_changeable_p(u32 flag)
+static inline __maybe_unused int flag_is_changeable_p(u32 flag)
 {
 	u32 f1, f2;
 
@@ -348,7 +348,7 @@ 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)
+static inline __maybe_unused int flag_is_changeable_p(u32 flag)
 {
 	return 1;
 }
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#1 lore raw
Quoted 5 lines · Andy Shevchenko

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)

Quoted 7 lines
      |                   ^~~~~~~~~~~~~~~~~~~~

Fix this by marking it with __maybe_unused (both cases for the sake of symmetry).

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").

Maybe something like this:

http://hansen.beer/~dave/intel/onelessifdef.patch

I assume the inlines were there to suppress the "unused" warnings in the first place. So, let's just 'use' them unconditionally and leave it up to the compiler to figure it out.

#2 lore raw
Quoted 1 line · Dave Hansen

On 9/5/24 10:02, Andy Shevchenko wrote:

...

Quoted 7 lines
Quoted 7 lines

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 marking it with __maybe_unused (both cases for the sake of symmetry).

Quoted 6 lines
Quoted 2 lines

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").

Maybe something like this:

http://hansen.beer/~dave/intel/onelessifdef.patch

Fine to me as long as the issue is solved :-) Please, submit it formally I may test it.

Signature · 2 lines
With Best Regards,
Andy Shevchenko