[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>

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index d260bffa01ab9ffd5949eec9f411554dc84ae9a7..4664be37038bed256e866583080035cf4a05a174 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -21,6 +21,9 @@
 #include <linux/acpi.h>
 #include <linux/efi.h>
 #include <linux/nodemask.h>
+#if defined(CONFIG_XEN) && defined(CONFIG_KEXEC)
+#include <linux/kexec.h>
+#endif
 #include <asm/pgalloc.h>
 #include <asm/tlb.h>
 #include <asm/meminit.h>
@@ -502,6 +505,9 @@ void __init find_memory(void)
        reserve_pernode_space();
        memory_less_nodes();
        initialize_pernode_data();
+#if defined(CONFIG_XEN) && defined(CONFIG_KEXEC)
+       xen_machine_kexec_setup_resources();
+#endif
 
        max_pfn = max_low_pfn;