ia64/xen-unstable

changeset 4818:bf186cdb8693

bitkeeper revision 1.1389.5.46 (4280957c13dvEVUuixaYEHltnt6E1A)

Fix ACPI initialisation.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 10 11:05:32 2005 +0000 (2005-05-10)
parents 14ee7bbe9cfe
children d2a202436c1c 036c7e34fdd8 cd66835c8905
files xen/arch/x86/setup.c
line diff
     1.1 --- a/xen/arch/x86/setup.c	Tue May 10 10:53:32 2005 +0000
     1.2 +++ b/xen/arch/x86/setup.c	Tue May 10 11:05:32 2005 +0000
     1.3 @@ -77,12 +77,7 @@ unsigned long wait_init_idle;
     1.4  
     1.5  struct exec_domain *idle_task[NR_CPUS] = { &idle0_exec_domain };
     1.6  
     1.7 -#ifdef CONFIG_ACPI_INTERPRETER
     1.8 -int acpi_disabled = 0;
     1.9 -#else
    1.10 -int acpi_disabled = 1;
    1.11 -#endif
    1.12 -EXPORT_SYMBOL(acpi_disabled);
    1.13 +int acpi_disabled;
    1.14  
    1.15  int phys_proc_id[NR_CPUS];
    1.16  int logical_proc_id[NR_CPUS];
    1.17 @@ -375,7 +370,10 @@ static void __init start_of_day(void)
    1.18  #endif
    1.19      paging_init();                /* not much here now, but sets up fixmap */
    1.20      if ( !opt_noacpi )
    1.21 +    {
    1.22 +        acpi_boot_table_init();
    1.23          acpi_boot_init();
    1.24 +    }
    1.25  #ifdef CONFIG_SMP
    1.26      if ( smp_found_config ) 
    1.27          get_smp_config();