aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-03-17 16:37:21 -0700
committerIngo Molnar <mingo@elte.hu>2008-04-24 23:57:32 +0200
commitdbe9e994c99ac9ac12d2b66ea42f44558f54fa52 (patch)
tree1723a47e74cd54094506812bcebaec21d0c14261
parentxen: short-cut for recursive event handling (diff)
downloadlinux-dev-dbe9e994c99ac9ac12d2b66ea42f44558f54fa52.tar.xz
linux-dev-dbe9e994c99ac9ac12d2b66ea42f44558f54fa52.zip
xen: no need for domU to worry about MCE/MCA
Mask MCE/MCA out of cpu caps. Its harmless to leave them there, but it does prevent the kernel from starting an unnecessary thread. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 943684566ebe..8c5ff24a492b 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -155,6 +155,8 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
if (*ax == 1)
maskedx = ~((1 << X86_FEATURE_APIC) | /* disable APIC */
(1 << X86_FEATURE_ACPI) | /* disable ACPI */
+ (1 << X86_FEATURE_MCE) | /* disable MCE */
+ (1 << X86_FEATURE_MCA) | /* disable MCA */
(1 << X86_FEATURE_ACC)); /* thermal monitoring */
asm(XEN_EMULATE_PREFIX "cpuid"