From 2d9d1eefec5e3001c6f8782facf842f5ef9ed47e Mon Sep 17 00:00:00 2001
From: "Liu, Jinsong" <jinsong.liu@intel.com>
Date: Thu, 8 Nov 2012 05:44:28 +0000
Subject: [PATCH] --- yaml --- r: 343423 b: refs/heads/master c:
 e3aa4e61b57da7574fdd1b4c9ca9bdee06a4d23e h: refs/heads/master i:   343421:
 d1939e377f40029fb8d6f29db16ae2a6e97f9889   343419:
 f0ea2dd15b69beeebd27ea9c10d9e91fdf2e1ac9   343415:
 722401ada0ed8988c34bc1c4565c3b0f9f6a829f   343407:
 40c477564d2baab38cf37173ecf8b5fc8e4e19c8   343391:
 159a7087b1b53477800ef537d331d47c734b36ea   343359:
 80825ae16762dbbfb0274d62098d84026aa5e651   343295:
 2603108975e548b79c71223f479fed427229f189 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/xen/enlighten.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 12b82f0fea98..28dfc613f77e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e3229dcdc80ff0b6304f14c578d76e7e10e226
+refs/heads/master: e3aa4e61b57da7574fdd1b4c9ca9bdee06a4d23e
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index a90c3bb58bed..eb0edff5499b 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -287,8 +287,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
 
 static bool __init xen_check_mwait(void)
 {
-#if defined(CONFIG_ACPI) && !defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) && \
-	!defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
+#ifdef CONFIG_ACPI
 	struct xen_platform_op op = {
 		.cmd			= XENPF_set_processor_pminfo,
 		.u.set_pminfo.id	= -1,
@@ -309,6 +308,13 @@ static bool __init xen_check_mwait(void)
 	if (!xen_initial_domain())
 		return false;
 
+	/*
+	 * When running under platform earlier than Xen4.2, do not expose
+	 * mwait, to avoid the risk of loading native acpi pad driver
+	 */
+	if (!xen_running_on_version_or_later(4, 2))
+		return false;
+
 	ax = 1;
 	cx = 0;