From f0b00d94874ca80f5a24caacdffa1595f0c84bc8 Mon Sep 17 00:00:00 2001
From: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Date: Fri, 29 Mar 2013 09:14:00 +0800
Subject: [PATCH] --- yaml --- r: 375439 b: refs/heads/master c:
 4ea9b9aca90cfc71e6872ed3522356755162932c h: refs/heads/master i:   375437:
 79514b5642599327c77668acfcfb4f0179568ee5   375435:
 df30897ed7b2a3ae31e6d3ac133938c04021fcdf   375431:
 ece73d0dc6a69c744b1bc43b87ad85a728a089b8   375423:
 e1cb8752a5e075c20d027daa4c351ebee6c07dbc v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0c46ae5cf63..d713a0d21934 100644
--- 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
index 31e19f97fb5a..4bd0066a1ef0 100644
--- 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);