[tip:,x86/microcode] x86/microcode: Make microcode_init() static
diff mbox series

Message ID 160941215697.414.16193539333675237267.tip-bot2@tip-bot2
State Accepted
Commit c769dcd423785703f17ca0a99925a7f9d84b3cbc
Headers show
Series
  • [tip:,x86/microcode] x86/microcode: Make microcode_init() static
Related show

Commit Message

tip-bot2 for Juergen Gross Dec. 31, 2020, 10:55 a.m. UTC
The following commit has been merged into the x86/microcode branch of tip:

Commit-ID:     c769dcd423785703f17ca0a99925a7f9d84b3cbc
Gitweb:        https://git.kernel.org/tip/c769dcd423785703f17ca0a99925a7f9d84b3cbc
Author:        Borislav Petkov <bp@suse.de>
AuthorDate:    Wed, 30 Dec 2020 11:20:25 +01:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Thu, 31 Dec 2020 11:44:00 +01:00

x86/microcode: Make microcode_init() static

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201230122147.26938-1-bp@alien8.de
---
 arch/x86/include/asm/microcode.h     | 2 --
 arch/x86/kernel/cpu/microcode/core.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 2b7cc53..ab45a22 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 ec6f041..b935e1b 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;