diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:45:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 19:45:26 -0800 |
| commit | d00c4ed02e90c1a4290acdd4f9bc4d056a573859 (patch) | |
| tree | e4d49b84cd22ea558f75f7691703636e75af7251 | |
| parent | 317d4f459393e27b3efedf571bd9e78a23fcd2ed (diff) | |
| parent | c769dcd423785703f17ca0a99925a7f9d84b3cbc (diff) | |
| download | bluetooth-next-d00c4ed02e90c1a4290acdd4f9bc4d056a573859.tar.gz | |
Merge tag 'x86_microcode_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode cleanup from Borislav Petkov:
"Make the driver init function static again"
* tag 'x86_microcode_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode: Make microcode_init() static
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 2b7cc5397f80df..ab45a220fac47b 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -127,14 +127,12 @@ static inline unsigned int x86_cpuid_family(void) } #ifdef CONFIG_MICROCODE -int __init microcode_init(void); extern void __init load_ucode_bsp(void); extern void load_ucode_ap(void); void reload_early_microcode(void); extern bool get_builtin_firmware(struct cpio_data *cd, const char *name); extern bool initrd_gone; #else -static inline int __init microcode_init(void) { return 0; }; static inline void __init load_ucode_bsp(void) { } static inline void load_ucode_ap(void) { } static inline void reload_early_microcode(void) { } diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index ec6f0415bc6d18..b935e1b5f115e7 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -830,7 +830,7 @@ static const struct attribute_group cpu_root_microcode_group = { .attrs = cpu_root_microcode_attrs, }; -int __init microcode_init(void) +static int __init microcode_init(void) { struct cpuinfo_x86 *c = &boot_cpu_data; int error; |