From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gerd Knorr <kraxel@suse.de>
Subject: [patch merge tree] disable ACPI in domU
Date: Wed, 07 Dec 2005 16:43:48 +0100
Message-ID: <43970334.6060409@suse.de>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------070204060101030203000605"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
Cc: Jan Beulich <JBeulich@novell.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------070204060101030203000605
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

   Hi,

The automatic acpi disable for domU doesn't work in the 2.6.14/15 based 
linux kernel trees, fix attached.

cheers,

   Gerd


--------------070204060101030203000605
Content-Type: text/plain;
 name="xen3-fixup-acpi-domU"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="xen3-fixup-acpi-domU"

Subject: Disable ACPI in unprivilidged xen domains
From: kraxel@suse.de

Index: linux-2.6.14/arch/i386/xen/kernel/setup.c
===================================================================
--- linux-2.6.14.orig/arch/i386/xen/kernel/setup.c	2005-12-07 13:30:20.000000000 +0100
+++ linux-2.6.14/arch/i386/xen/kernel/setup.c	2005-12-07 16:19:12.000000000 +0100
@@ -1805,15 +1805,12 @@ void __init setup_arch(char **cmdline_p)
 	op.u.set_iopl.iopl = 1;
 	HYPERVISOR_physdev_op(&op);
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 	if (!(xen_start_info->flags & SIF_INITDOMAIN)) {
 		printk(KERN_INFO "ACPI in unprivileged domain disabled\n");
 		acpi_disabled = 1;
 		acpi_ht = 0;
 	}
-#endif
-
-#ifdef CONFIG_ACPI
 	/*
 	 * Parse the ACPI tables for possible boot-time SMP configuration.
 	 */

--------------070204060101030203000605
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------070204060101030203000605--