[Xen-changelog] Fix xen0 kernel to run in unprivileged domains by disabling ACPI.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1423.11.1, 2005/05/11 23:39:52+01:00, mwilli2@xxxxxxxxxxxxxxxxxxxx

        Fix xen0 kernel to run in unprivileged domains by disabling ACPI.
        
        Signed-off-by: mark.williamson@xxxxxxxxxxxx



 setup.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-12 
06:04:03 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-12 
06:04:03 -04:00
@@ -1566,12 +1566,19 @@
        if (efi_enabled)
                efi_map_memmap();
 
-       /*
-        * Parse the ACPI tables for possible boot-time SMP configuration.
-        */
-       acpi_boot_table_init();
-       acpi_boot_init();
+       if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
+       {
+            printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
+            acpi_disabled = 1;
+             acpi_ht = 0;
+       }
 
+       /*
+        * Parse the ACPI tables for possible boot-time SMP configuration.
+        */          
+        acpi_boot_table_init();
+        acpi_boot_init();
+            
 #ifdef CONFIG_X86_LOCAL_APIC
        if (smp_found_config)
                get_smp_config();

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