aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-09-28 11:45:51 -0400
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-10-22 16:26:02 -0400
commitff12849a7a187e17fcbd888b39850d22103395c6 (patch)
treeba7276b8c6afbee0d0a9add10131b55d7444fd98
parent4fe7d5a708a955b35e3fdc4dea3e0b7a6ae2eb06 (diff)
xen: mask the MTRR feature from the cpuid
We don't want Linux to think that the cpu supports MTRRs when running under Xen because MTRR operations could only be performed through hypercalls. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/xen/enlighten.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 9efb0044625..d48a32b10a3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -243,6 +243,7 @@ static __init void xen_init_cpuid_mask(void)
243 cpuid_leaf1_edx_mask = 243 cpuid_leaf1_edx_mask =
244 ~((1 << X86_FEATURE_MCE) | /* disable MCE */ 244 ~((1 << X86_FEATURE_MCE) | /* disable MCE */
245 (1 << X86_FEATURE_MCA) | /* disable MCA */ 245 (1 << X86_FEATURE_MCA) | /* disable MCA */
246 (1 << X86_FEATURE_MTRR) | /* disable MTRR */
246 (1 << X86_FEATURE_ACC)); /* thermal monitoring */ 247 (1 << X86_FEATURE_ACC)); /* thermal monitoring */
247 248
248 if (!xen_initial_domain()) 249 if (!xen_initial_domain())