[Xen-changelog] [linux-2.6.18-xen] [IA64] backport point saved_max_pfn to the max_pfn of the entire system

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

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1217233365 -32400
# Node ID 4921b258e1329f3659c1a567cfebb5bd28596998
# Parent  ccfec88b3538b2c87eb85d68584313e71e4e887a
[IA64] backport point saved_max_pfn to the max_pfn of the entire system

backport Upstream Linux changeset f4a570997e71b892805a1e71303d09c327af135f

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 arch/ia64/kernel/efi.c |    6 ++++++
 arch/ia64/mm/contig.c  |    5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff -r ccfec88b3538 -r 4921b258e132 arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/efi.c    Mon Jul 28 17:22:45 2008 +0900
+++ b/arch/ia64/kernel/efi.c    Mon Jul 28 17:22:45 2008 +0900
@@ -21,6 +21,7 @@
  *     Skip non-WB memory and ignore empty memory ranges.
  */
 #include <linux/module.h>
+#include <linux/bootmem.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
@@ -1015,6 +1016,11 @@ efi_memmap_init(unsigned long *s, unsign
                } else
                        ae = efi_md_end(md);
 
+#ifdef CONFIG_CRASH_DUMP
+               /* saved_max_pfn should ignore max_addr= command line arg */
+               if (saved_max_pfn < (ae >> PAGE_SHIFT))
+                       saved_max_pfn = (ae >> PAGE_SHIFT);
+#endif
                /* keep within max_addr= and min_addr= command line arg */
                as = max(as, min_addr);
                ae = min(ae, max_addr);
diff -r ccfec88b3538 -r 4921b258e132 arch/ia64/mm/contig.c
--- a/arch/ia64/mm/contig.c     Mon Jul 28 17:22:45 2008 +0900
+++ b/arch/ia64/mm/contig.c     Mon Jul 28 17:22:45 2008 +0900
@@ -181,11 +181,6 @@ find_memory (void)
 
        find_initrd();
 
-#ifdef CONFIG_CRASH_DUMP
-       /* If we are doing a crash dump, we still need to know the real mem
-        * size before original memory map is * reset. */
-       saved_max_pfn = max_pfn;
-#endif
 }
 
 #ifdef CONFIG_SMP

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