diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-29 07:51:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-29 07:51:20 +0100 |
| commit | 6d84d1d13081dca4b6bd532fb8b95a7ed5a816dd (patch) | |
| tree | 9858b5ea4c33465145966669362a69e1c5ac32c2 | |
| parent | c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e (diff) | |
| parent | da63865a01c6384d459464e5165d95d4f04878d8 (diff) | |
| download | blackbird-op-linux-6d84d1d13081dca4b6bd532fb8b95a7ed5a816dd.tar.gz blackbird-op-linux-6d84d1d13081dca4b6bd532fb8b95a7ed5a816dd.zip | |
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>
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 15c29096136b..36a83617eb21 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -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(); |
