[Xen-changelog] Fix ACPI initialisation.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1469, 2005/05/10 12:05:32+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix ACPI initialisation.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 setup.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


diff -Nru a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      2005-05-10 08:04:06 -04:00
+++ b/xen/arch/x86/setup.c      2005-05-10 08:04:06 -04:00
@@ -77,12 +77,7 @@
 
 struct exec_domain *idle_task[NR_CPUS] = { &idle0_exec_domain };
 
-#ifdef CONFIG_ACPI_INTERPRETER
-int acpi_disabled = 0;
-#else
-int acpi_disabled = 1;
-#endif
-EXPORT_SYMBOL(acpi_disabled);
+int acpi_disabled;
 
 int phys_proc_id[NR_CPUS];
 int logical_proc_id[NR_CPUS];
@@ -375,7 +370,10 @@
 #endif
     paging_init();                /* not much here now, but sets up fixmap */
     if ( !opt_noacpi )
+    {
+        acpi_boot_table_init();
         acpi_boot_init();
+    }
 #ifdef CONFIG_SMP
     if ( smp_found_config ) 
         get_smp_config();

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