ia64/xen-unstable

changeset 15154:b46c2ff6dfb0

[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@mxp.nes.nec.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Thu May 31 14:47:08 2007 -0600 (2007-05-31)
parents 148b6fc8f29b
children c0cdcebc0377
files xen/arch/ia64/linux-xen/setup.c xen/arch/ia64/xen/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/setup.c	Thu May 31 11:42:40 2007 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Thu May 31 14:47:08 2007 -0600
     1.3 @@ -506,13 +506,6 @@ setup_arch (char **cmdline_p)
     1.4  	if (early_console_setup(*cmdline_p) == 0)
     1.5  		mark_bsp_online();
     1.6  
     1.7 -#ifdef XEN
     1.8 -}
     1.9 -
    1.10 -void __init
    1.11 -late_setup_arch (char **cmdline_p)
    1.12 -{
    1.13 -#endif
    1.14  #ifdef CONFIG_ACPI_BOOT
    1.15  	/* Initialize the ACPI boot-time table parser */
    1.16  	acpi_table_init();
    1.17 @@ -525,6 +518,13 @@ late_setup_arch (char **cmdline_p)
    1.18  # endif
    1.19  #endif /* CONFIG_APCI_BOOT */
    1.20  
    1.21 +#ifdef XEN
    1.22 +}
    1.23 +
    1.24 +void __init
    1.25 +late_setup_arch (char **cmdline_p)
    1.26 +{
    1.27 +#endif
    1.28  #ifndef XEN
    1.29  	find_memory();
    1.30  #endif
     2.1 --- a/xen/arch/ia64/xen/xensetup.c	Thu May 31 11:42:40 2007 -0600
     2.2 +++ b/xen/arch/ia64/xen/xensetup.c	Thu May 31 14:47:08 2007 -0600
     2.3 @@ -433,13 +433,13 @@ void __init start_kernel(void)
     2.4  
     2.5      alloc_dom0();
     2.6  
     2.7 -    end_boot_allocator();
     2.8 -
     2.9      init_xenheap_pages(__pa(xen_heap_start), xenheap_phys_end);
    2.10      printk("Xen heap: %luMB (%lukB)\n",
    2.11  	(xenheap_phys_end-__pa(xen_heap_start)) >> 20,
    2.12  	(xenheap_phys_end-__pa(xen_heap_start)) >> 10);
    2.13  
    2.14 +    end_boot_allocator();
    2.15 +
    2.16      late_setup_arch(&cmdline);
    2.17  
    2.18      scheduler_init();