ia64/xen-unstable

changeset 4860:b633f24b48be

bitkeeper revision 1.1389.15.20 (428294c4qHPwfJns6WjtuWHA518RQg)

Build tweak for earlier domU ACPI fixes. Silly me.

Signed-off-by: mark.williamson@cl.cam.ac.uk
author mwilli2@equilibrium.research
date Wed May 11 23:27:00 2005 +0000 (2005-05-11)
parents b49e8f73f9ba
children 9cc14753366a 013d5aa0f1e8
files linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Wed May 11 22:42:28 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Wed May 11 23:27:00 2005 +0000
     1.3 @@ -1571,12 +1571,14 @@ void __init setup_arch(char **cmdline_p)
     1.4  	op.u.set_iopl.iopl = current->thread.io_pl = 1;
     1.5  	HYPERVISOR_physdev_op(&op);
     1.6  
     1.7 +#ifdef CONFIG_ACPI_BOOT
     1.8  	if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
     1.9  	{
    1.10  	     printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
    1.11  	     acpi_disabled = 1;
    1.12               acpi_ht = 0;
    1.13  	}
    1.14 +#endif
    1.15  
    1.16   	/*
    1.17   	 * Parse the ACPI tables for possible boot-time SMP configuration.