x86: Fix amd_check_microcode() declaration
PATCH v2 1/1 x86: Fix amd_check_microcode() declaration
From: Arnd Bergmann <[email protected]>
The newly added amd_check_microcode() function has two conflicting definitions if CONFIG_CPU_SUP_AMD is enabled and CONFIG_MICROCODE_AMD is disabled. Since the header with the stub definition is not included in cpu/amd.c, this only causes a -Wmissing-prototype warning with W=1
arch/x86/kernel/cpu/amd.c:1289:6: error: no previous prototype for 'amd_check_microcode' [-Werror=missing-prototypes]
Adding the missing #include shows the other problem:
arch/x86/kernel/cpu/amd.c:1290:6: error: redefinition of 'amd_check_microcode' arch/x86/include/asm/microcode_amd.h:58:20: note: previous definition of 'amd_check_microcode' with type 'void(void)'
Move the declaration into a more appropriate header that is already included, with the #ifdef check changed to match the definition's.
--- arch/x86/include/asm/microcode_amd.h | 3 +-- arch/x86/include/asm/processor.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -2
@@ -48,13 +48,12 @@ extern void __init load_ucode_amd_bsp(unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family);void reload_ucode_amd (unsigned int cpu); -extern void amd_check_microcode (void );#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; }static inline void reload_ucode_amd (unsigned int cpu) {} -static inline void amd_check_microcode (void ) {}#endif +#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/include/asm/processor.h +2 -0
@@ -682,9 +682,11 @@ extern u16 get_llc_id(unsigned int cpu);#ifdef CONFIG_CPU_SUP_AMD extern u32 amd_get_nodes_per_socket (void );extern u32 amd_get_highest_perf (void ); +extern void amd_check_microcode (void );#else static inline u32 amd_get_nodes_per_socket (void ) {return 0 ; }static inline u32 amd_get_highest_perf (void ) {return 0 ; } +static inline void amd_check_microcode (void ) { }#endif extern unsigned long arch_align_stack (unsigned long sp);
Signature · 1 line
2.39.2
[tip: x86/cleanups] x86/cpu: Fix amd_check_microcode() declaration
The following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 566ffa3ae9649f7aa1debcf559ee7e26ed4a110f Gitweb: https://git.kernel.org/tip/566ffa3ae9649f7aa1debcf559ee7e26ed4a110f Author: Arnd Bergmann <[email protected]> AuthorDate: Tue, 25 Jul 2023 14:17:39 +02:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 31 Jul 2023 11:03:16 +02:00
x86/cpu: Fix amd_check_microcode() declaration
The newly added amd_check_microcode() function has two conflicting definitions if CONFIG_CPU_SUP_AMD is enabled and CONFIG_MICROCODE_AMD is disabled. Since the header with the stub definition is not included in cpu/amd.c, this only causes a -Wmissing-prototype warning with W=1:
arch/x86/kernel/cpu/amd.c:1289:6: error: no previous prototype for 'amd_check_microcode' [-Werror=missing-prototypes]
Adding the missing #include shows the other problem:
arch/x86/kernel/cpu/amd.c:1290:6: error: redefinition of 'amd_check_microcode' arch/x86/include/asm/microcode_amd.h:58:20: note: previous definition of 'amd_check_microcode' with type 'void(void)'
Move the declaration into a more appropriate header that is already included, with the #ifdef check changed to match the definition's.
--- arch/x86/include/asm/microcode_amd.h | 3 +-- arch/x86/include/asm/processor.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/include/asm/microcode_amd.h +1 -2
@@ -48,13 +48,12 @@ extern void __init load_ucode_amd_bsp(unsigned int family);extern void load_ucode_amd_ap (unsigned int family);extern int __init save_microcode_in_initrd_amd (unsigned int family);void reload_ucode_amd (unsigned int cpu); -extern void amd_check_microcode (void );#else static inline void __init load_ucode_amd_bsp (unsigned int family) {}static inline void load_ucode_amd_ap (unsigned int family) {}static inline int __init save_microcode_in_initrd_amd (unsigned int family) {return -EINVAL ; }static inline void reload_ucode_amd (unsigned int cpu) {} -static inline void amd_check_microcode (void ) {}#endif +#endif /* _ASM_X86_MICROCODE_AMD_H */
arch/x86/include/asm/processor.h +2 -0
@@ -682,9 +682,11 @@ extern u16 get_llc_id(unsigned int cpu);#ifdef CONFIG_CPU_SUP_AMD extern u32 amd_get_nodes_per_socket (void );extern u32 amd_get_highest_perf (void ); +extern void amd_check_microcode (void );#else static inline u32 amd_get_nodes_per_socket (void ) {return 0 ; }static inline u32 amd_get_highest_perf (void ) {return 0 ; } +static inline void amd_check_microcode (void ) { }#endif extern unsigned long arch_align_stack (unsigned long sp);