aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2016-02-16 03:43:19 -0500
committerIngo Molnar <mingo@kernel.org>2016-02-17 02:46:07 -0500
commit84aba677f009e20185aea322563389ad56e0ef7e (patch)
tree2bc6188b64d3218016e45d5bffc26ef4fac61988
parentb584303261b7041f209afde4bf7ddb7a21598a1f (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 <boris.ostrovsky@oracle.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: david.vrabel@citrix.com Cc: konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org Link: http://lkml.kernel.org/r/1455612202-14414-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/cpu/microcode/core.c2
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)
623 struct cpuinfo_x86 *c = &boot_cpu_data; 623 struct cpuinfo_x86 *c = &boot_cpu_data;
624 int error; 624 int error;
625 625
626 if (paravirt_enabled() || dis_ucode_ldr) 626 if (dis_ucode_ldr)
627 return -EINVAL; 627 return -EINVAL;
628 628
629 if (c->x86_vendor == X86_VENDOR_INTEL) 629 if (c->x86_vendor == X86_VENDOR_INTEL)