Skip to content

Commit 067ba54

Browse files
committed
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
2 parents 30f5a75 + 82c881b commit 067ba54

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/microcode_amd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ static inline void __init load_ucode_amd_bsp(unsigned int family) {}
5353
static inline void load_ucode_amd_ap(unsigned int family) {}
5454
static inline int __init
5555
save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
56-
void reload_ucode_amd(void) {}
56+
static inline void reload_ucode_amd(void) {}
5757
#endif
5858
#endif /* _ASM_X86_MICROCODE_AMD_H */

0 commit comments

Comments
 (0)