summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-09-28 15:45:51 (GMT)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>2010-10-22 20:26:02 (GMT)
commitff12849a7a187e17fcbd888b39850d22103395c6 (patch)
treeba7276b8c6afbee0d0a9add10131b55d7444fd98 /arch/x86
parent4fe7d5a708a955b35e3fdc4dea3e0b7a6ae2eb06 (diff)
downloadlinux-fsl-qoriq-ff12849a7a187e17fcbd888b39850d22103395c6.tar.xz
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>
Diffstat (limited to 'arch/x86')
-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 9efb004..d48a32b 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)
cpuid_leaf1_edx_mask =
~((1 << X86_FEATURE_MCE) | /* disable MCE */
(1 << X86_FEATURE_MCA) | /* disable MCA */
+ (1 << X86_FEATURE_MTRR) | /* disable MTRR */
(1 << X86_FEATURE_ACC)); /* thermal monitoring */
if (!xen_initial_domain())