[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Thu, 7 Jul 2011 11:19:48 -0700
From: Anupam Chanda <achanda@...ira.com>
To: tglx@...utronix.de, mingo@...hat.com, hpa@...or.com,
x86@...nel.org, stefano.stabellini@...citrix.com,
jeremy.fitzhardinge@...rix.com, eddie.dong@...el.com,
linux-kernel@...r.kernel.org
Cc: achanda@...ira.com
Subject: [PATCH] Change hypervisor detection order
Detect Xen before HyperV because in Viridian compatibility mode Xen presents
itself as HyperV.
Signed-off-by: Anupam Chanda <achanda@...ira.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
---
arch/x86/kernel/cpu/hypervisor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 8095f86..ca23091 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -33,10 +33,10 @@
static const __initconst struct hypervisor_x86 * const hypervisors[] =
{
&x86_hyper_vmware,
- &x86_hyper_ms_hyperv,
#ifdef CONFIG_XEN_PVHVM
&x86_hyper_xen_hvm,
#endif
+ &x86_hyper_ms_hyperv,
};
const struct hypervisor_x86 *x86_hyper;
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists