x86/cpu: Fix amd_check_microcode() declaration
authorArnd Bergmann <arnd@arndb.de>
Tue, 25 Jul 2023 12:17:39 +0000 (14:17 +0200)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 31 Jul 2023 09:03:16 +0000 (11:03 +0200)
commit566ffa3ae9649f7aa1debcf559ee7e26ed4a110f
tree885a2f00f5955d5e2dc7b21c732088befe9778bc
parent5d0c230f1de8c7515b6567d9afba1f196fb4e2f4
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.

Fixes: 522b1d69219d8 ("x86/cpu/amd: Add a Zenbleed fix")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230725121751.2007665-1-arnd@kernel.org
arch/x86/include/asm/microcode_amd.h
arch/x86/include/asm/processor.h