[Xen-changelog] [xen-unstable] [IA64] Fix initialization order for buddy allocator

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1180644428 21600
# Node ID b46c2ff6dfb0de75e17fee01f0adc4d35d5e8322
# Parent  148b6fc8f29b7b3de496e29f99afdd1e2cfb2bc4
[IA64] Fix initialization order for buddy allocator

Fix initialization order of buddy allocator to avoid panic
on machines with multi NUMA node.

Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
---
 xen/arch/ia64/linux-xen/setup.c |   14 +++++++-------
 xen/arch/ia64/xen/xensetup.c    |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff -r 148b6fc8f29b -r b46c2ff6dfb0 xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c   Thu May 31 11:42:40 2007 -0600
+++ b/xen/arch/ia64/linux-xen/setup.c   Thu May 31 14:47:08 2007 -0600
@@ -506,13 +506,6 @@ setup_arch (char **cmdline_p)
        if (early_console_setup(*cmdline_p) == 0)
                mark_bsp_online();
 
-#ifdef XEN
-}
-
-void __init
-late_setup_arch (char **cmdline_p)
-{
-#endif
 #ifdef CONFIG_ACPI_BOOT
        /* Initialize the ACPI boot-time table parser */
        acpi_table_init();
@@ -525,6 +518,13 @@ late_setup_arch (char **cmdline_p)
 # endif
 #endif /* CONFIG_APCI_BOOT */
 
+#ifdef XEN
+}
+
+void __init
+late_setup_arch (char **cmdline_p)
+{
+#endif
 #ifndef XEN
        find_memory();
 #endif
diff -r 148b6fc8f29b -r b46c2ff6dfb0 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c      Thu May 31 11:42:40 2007 -0600
+++ b/xen/arch/ia64/xen/xensetup.c      Thu May 31 14:47:08 2007 -0600
@@ -433,12 +433,12 @@ void __init start_kernel(void)
 
     alloc_dom0();
 
-    end_boot_allocator();
-
     init_xenheap_pages(__pa(xen_heap_start), xenheap_phys_end);
     printk("Xen heap: %luMB (%lukB)\n",
        (xenheap_phys_end-__pa(xen_heap_start)) >> 20,
        (xenheap_phys_end-__pa(xen_heap_start)) >> 10);
+
+    end_boot_allocator();
 
     late_setup_arch(&cmdline);
 

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