[Xen-changelog] Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used as a guest kernel on x86_64

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxx
# Node ID 7f732bba3ed4a16fa8599a99b8a37ace90add049
# Parent  f529cd119470032c2bc70b21432e733f9605727b
Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be 
used as a guest kernel on x86_64
Signed-off-by: ian@xxxxxxxxxxxxx

diff -r f529cd119470 -r 7f732bba3ed4 
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c       Thu Sep 29 
17:28:28 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c       Thu Sep 29 
18:59:18 2005
@@ -771,11 +771,14 @@
                                virt_to_mfn(&phys_to_machine_mapping[i]);
                }
                HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
-               
-               
-
-
-
+       }
+
+       if ( ! (xen_start_info->flags & SIF_INITDOMAIN))
+       {
+               acpi_disabled = 1;
+#ifdef  CONFIG_ACPI_BOOT
+               acpi_ht = 0;
+#endif
        }
 #endif
 

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