diff options
| author | Boris Ostrovsky <[email protected]> | 2016-02-16 09:43:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-02-17 08:46:07 +0100 |
| commit | 84aba677f009e20185aea322563389ad56e0ef7e (patch) | |
| tree | 2bc6188b64d3218016e45d5bffc26ef4fac61988 /arch/x86/kernel/cpu/microcode | |
| parent | b584303261b7041f209afde4bf7ddb7a21598a1f (diff) | |
x86/microcode: Remove unnecessary paravirt_enabled check
Commit:
a18a0f6850d4 ("x86, microcode: Don't initialize microcode code on paravirt")
added a paravirt test in microcode_init(), primarily to avoid making
mc_bp_resume()->load_ucode_ap()->check_loader_disabled_ap() calls
because on 32-bit kernels this callchain ends up using __pa_nodebug()
macro which is invalid for Xen PV guests.
A subsequent commit:
fbae4ba8c4a3 ("x86, microcode: Reload microcode on resume")
eliminated this callchain thus making a18a0f6850d4 unnecessary.
Signed-off-by: Boris Ostrovsky <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
| -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 cea8552e2b3a..ac360bfbbdb6 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -623,7 +623,7 @@ int __init microcode_init(void) struct cpuinfo_x86 *c = &boot_cpu_data; int error; - if (paravirt_enabled() || dis_ucode_ldr) + if (dis_ucode_ldr) return -EINVAL; if (c->x86_vendor == X86_VENDOR_INTEL) |