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>
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user