Re: [Xen-ia64-devel] [PATCH]fix initialization order of buddy allocator

[Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>]

Hi,

I resend the patch in proper format.


Thanks,
Daisuke Nishimura


# HG changeset patch
# User Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
# Date 1180428412 -32400
# Node ID dd2befcac38ef6c404470c90f2443dca4978a776
# Parent  2b14a1f22eecc73807578ceb78fa994449911d8b
Fix initialization order of buddy allocator to avoid panic
on machines with multi NUMA node.

Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>

diff -r 2b14a1f22eec -r dd2befcac38e xen/arch/ia64/linux-xen/setup.c
--- a/xen/arch/ia64/linux-xen/setup.c   Fri May 25 09:43:21 2007 -0600
+++ b/xen/arch/ia64/linux-xen/setup.c   Tue May 29 17:46:52 2007 +0900
@@ -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 2b14a1f22eec -r dd2befcac38e xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c      Fri May 25 09:43:21 2007 -0600
+++ b/xen/arch/ia64/xen/xensetup.c      Tue May 29 17:46:52 2007 +0900
@@ -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-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel