Commit d00c4ed0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 317d4f45 c769dcd4

arch/x86/include/asm/microcode.h

+0 −2
Original line number Diff line number Diff line
@@ -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)			{ }

arch/x86/kernel/cpu/microcode/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;