---

yaml
---
r: 343423
b: refs/heads/master
c: e3aa4e6
h: refs/heads/master
i:
  343421: d1939e3
  343419: f0ea2dd
  343415: 722401a
  343407: 40c4775
  343391: 159a708
  343359: 80825ae
  343295: 2603108
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e3229dcdc80ff0b6304f14c578d76e7e10e226
+refs/heads/master: e3aa4e61b57da7574fdd1b4c9ca9bdee06a4d23e

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;