Commit 6d84d1d1 authored Jan 29, 2015 by Ingo Molnar

Merge tag 'microcode_fix_for_3.19' of...

Merge tag 'microcode_fix_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

 into x86/urgent

Pull microcode fix from Borislav Petkov:

 "One final fix for 3.19 to address a wrongful deregistering of the
  microcode loader module."

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents c59c961c da63865a

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -552,7 +552,7 @@ static int __init microcode_init(void)
		int error;

		if (paravirt_enabled() \|\| dis_ucode_ldr)
		return 0;
		return -EINVAL;

		if (c->x86_vendor == X86_VENDOR_INTEL)
		microcode_ops = init_intel_microcode();