[Xen-devel] [PATCH 2/2] Revert pad config check in xen_check_mwait

["Liu, Jinsong" <jinsong.liu@xxxxxxxxx>]

Seems my mail server has a little problem, so re-send it. If you receive it 
twice, please ignore one. Sorry :)

===========
>From 9ed5cd6012ac0832973be6e7fa01fc159f373e1c Mon Sep 17 00:00:00 2001
From: Liu, Jinsong <jinsong.liu@xxxxxxxxx>
Date: Fri, 26 Oct 2012 03:14:46 +0800
Subject: [PATCH 2/2] Revert pad config check in xen_check_mwait

With Xen acpi pad logic added into kernel, we can now revert xen mwait related
patch df88b2d96e36d9a9e325bfcd12eb45671cbbc937. The reason is, when runs under
Xen platform, Xen pad driver would be early loaded, so native pad driver would
fail to be loaded, and hence no mwait/monitor #UD risk again.

Signed-off-by: Liu, Jinsong <jinsong.liu@xxxxxxxxx>
---
 arch/x86/xen/enlighten.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 586d838..8bf28b1 100644
--- a/arch/x86/xen/enlighten.c
+++ b/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,
-- 
1.7.1

Attachment: 0002-Revert-pad-config-check-in-xen_check_mwait.patch
Description: 0002-Revert-pad-config-check-in-xen_check_mwait.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel