ia64/linux-2.6.18-xen.hg

changeset 614:34905b87bb83

[IA64] initialize /proc/iomem_machine properly when discontig mem.

With CONFIG_DISCONTIGMEM enabled /proc/iomem_machine isn't
initialized properly so that kexec failes because kexec-tools wrongly
tries to use ia64 boot mem (or efi memmap area).
This patch fixes /proc/iomem_machine.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Isaku Yamahata <yamahata@valinux.co.jp>
date Mon Jul 28 17:22:46 2008 +0900 (2008-07-28)
parents 4d04f615e694
children 770a0e422f64
files arch/ia64/mm/discontig.c
line diff
     1.1 --- a/arch/ia64/mm/discontig.c	Mon Jul 28 17:22:45 2008 +0900
     1.2 +++ b/arch/ia64/mm/discontig.c	Mon Jul 28 17:22:46 2008 +0900
     1.3 @@ -21,6 +21,9 @@
     1.4  #include <linux/acpi.h>
     1.5  #include <linux/efi.h>
     1.6  #include <linux/nodemask.h>
     1.7 +#if defined(CONFIG_XEN) && defined(CONFIG_KEXEC)
     1.8 +#include <linux/kexec.h>
     1.9 +#endif
    1.10  #include <asm/pgalloc.h>
    1.11  #include <asm/tlb.h>
    1.12  #include <asm/meminit.h>
    1.13 @@ -502,6 +505,9 @@ void __init find_memory(void)
    1.14  	reserve_pernode_space();
    1.15  	memory_less_nodes();
    1.16  	initialize_pernode_data();
    1.17 +#if defined(CONFIG_XEN) && defined(CONFIG_KEXEC)
    1.18 +	xen_machine_kexec_setup_resources();
    1.19 +#endif
    1.20  
    1.21  	max_pfn = max_low_pfn;
    1.22