ia64/xen-unstable

changeset 4859:b49e8f73f9ba

bitkeeper revision 1.1389.15.19 (42828a54qRrbnAaV5PFjo8DC3XonFA)

Merge
author mwilli2@equilibrium.research
date Wed May 11 22:42:28 2005 +0000 (2005-05-11)
parents 7b0fa15646cd 28ca42d843d8
children b633f24b48be
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 20:25:47 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c	Wed May 11 22:42:28 2005 +0000
     1.3 @@ -1571,12 +1571,19 @@ 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 -	/*
     1.8 -	 * Parse the ACPI tables for possible boot-time SMP configuration.
     1.9 -	 */
    1.10 -	acpi_boot_table_init();
    1.11 -	acpi_boot_init();
    1.12 +	if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
    1.13 +	{
    1.14 +	     printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
    1.15 +	     acpi_disabled = 1;
    1.16 +             acpi_ht = 0;
    1.17 +	}
    1.18  
    1.19 + 	/*
    1.20 + 	 * Parse the ACPI tables for possible boot-time SMP configuration.
    1.21 + 	 */	     
    1.22 +        acpi_boot_table_init();
    1.23 +        acpi_boot_init();
    1.24 +	     
    1.25  #ifdef CONFIG_X86_LOCAL_APIC
    1.26  	if (smp_found_config)
    1.27  		get_smp_config();