[Xen-changelog] [linux-2.6.18-xen] [IA64] initialize /proc/iomem_machine properly when discontig mem.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1217233366 -32400
# Node ID 34905b87bb834f2d034b984ac07a83862a2bf1c1
# Parent  4d04f615e694e4d401f78358aa5d9c860717e03e
[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@xxxxxxxxxxxxx>
---
 arch/ia64/mm/discontig.c |    6 ++++++
 1 files changed, 6 insertions(+)

diff -r 4d04f615e694 -r 34905b87bb83 arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/discontig.c  Mon Jul 28 17:22:45 2008 +0900
+++ b/arch/ia64/mm/discontig.c  Mon Jul 28 17:22:46 2008 +0900
@@ -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;
 

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