Commit 6d84d1d1 authored by Ingo Molnar's avatar 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: default avatarIngo Molnar <mingo@kernel.org>
parents c59c961c da63865a
...@@ -552,7 +552,7 @@ static int __init microcode_init(void) ...@@ -552,7 +552,7 @@ static int __init microcode_init(void)
int error; int error;
if (paravirt_enabled() || dis_ucode_ldr) if (paravirt_enabled() || dis_ucode_ldr)
return 0; return -EINVAL;
if (c->x86_vendor == X86_VENDOR_INTEL) if (c->x86_vendor == X86_VENDOR_INTEL)
microcode_ops = init_intel_microcode(); microcode_ops = init_intel_microcode();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment