---

yaml --- r: 375439 b: refs/heads/master c: 4ea9b9a h: refs/heads/master i: 375437: 79514b5 375435: df30897 375431: ece73d0 375423: e1cb875 v: v3
git-mirror · May 8, 2013 · f0b00d9 · f0b00d9
1 parent b5668cd
commit f0b00d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b404d99369ba3e6ec3259a4ea14bf1c18283f3
+refs/heads/master: 4ea9b9aca90cfc71e6872ed3522356755162932c
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
@@ -429,6 +429,9 @@ static void __init xen_init_cpuid_mask(void)
 		cpuid_leaf1_edx_mask &=
 			~((1 << X86_FEATURE_APIC) |  /* disable local APIC */
 			  (1 << X86_FEATURE_ACPI));  /* disable ACPI */
+
+	cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_X2APIC % 32));
+
 	ax = 1;
 	cx = 0;
 	xen_cpuid(&ax, &bx, &cx, &dx);