Commit-ID:  84aba677f009e20185aea322563389ad56e0ef7e
Gitweb:     http://git.kernel.org/tip/84aba677f009e20185aea322563389ad56e0ef7e
Author:     Boris Ostrovsky <boris.ostrov...@oracle.com>
AuthorDate: Tue, 16 Feb 2016 09:43:19 +0100
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Wed, 17 Feb 2016 08:46:07 +0100

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.ostrov...@oracle.com>
Signed-off-by: Borislav Petkov <b...@suse.de>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: david.vra...@citrix.com
Cc: konrad.w...@oracle.com
Cc: xen-de...@lists.xenproject.org
Link: http://lkml.kernel.org/r/1455612202-14414-2-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 arch/x86/kernel/cpu/microcode/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/microcode/core.c 
b/arch/x86/kernel/cpu/microcode/core.c
index cea8552..ac360bf 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)

Reply via email to