aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-01-27 09:25:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-01-27 09:25:59 -0800
commit067ba54c7a7d4cb76da4c8434bd6f117b61ac8ee (patch)
tree26c962395a2e5a4af63deef7ff014582b8655a53 /arch/x86/include
parent30f5a75640998900d995e099e060e920e72790b2 (diff)
parent82c881b28aa89215a760e39c5f6bcde2d6ce4918 (diff)
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode update from Borislav Petkov: "Another boring branch this time around: mark a stub function inline, by Valdis Kletnieks" * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/microcode/AMD: Make stub function static inline
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/microcode_amd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
index 209492849566..6685e1218959 100644
--- a/arch/x86/include/asm/microcode_amd.h
+++ b/arch/x86/include/asm/microcode_amd.h
@@ -53,6 +53,6 @@ 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; }
-void reload_ucode_amd(void) {}
+static inline void reload_ucode_amd(void) {}
#endif
#endif /* _ASM_X86_MICROCODE_AMD_H */

Privacy Policy