• Arnd Bergmann's avatar
    x86/cpu: Fix amd_check_microcode() declaration · 566ffa3a
    Arnd Bergmann authored
    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.
    
    Fixes: 522b1d69 ("x86/cpu/amd: Add a Zenbleed fix")
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
    Link: https://lore.kernel.org/r/20230725121751.2007665-1-arnd@kernel.org
    566ffa3a
microcode_amd.h 1.45 KB