[Xen-changelog] [linux-2.6.18-xen] [IA64] backport Pick highest possible saved_max_pfn for crash_dump

["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 4d04f615e694e4d401f78358aa5d9c860717e03e
# Parent  4921b258e1329f3659c1a567cfebb5bd28596998
[IA64] backport Pick highest possible saved_max_pfn for crash_dump

backport Upstream Linux changeset e55fdf11f3029bcd41b1b9547ad9db12c27eea76

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

diff -r 4921b258e132 -r 4d04f615e694 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
@@ -977,6 +977,11 @@ efi_memmap_init(unsigned long *s, unsign
                if (!is_available_memory(md))
                        continue;
 
+#ifdef CONFIG_CRASH_DUMP
+               /* saved_max_pfn should ignore max_addr= command line arg */
+               if (saved_max_pfn < (efi_md_end(md) >> PAGE_SHIFT))
+                       saved_max_pfn = (efi_md_end(md) >> PAGE_SHIFT);
+#endif
                /*
                 * Round ends inward to granule boundaries
                 * Give trimmings to uncached allocator
@@ -1016,11 +1021,6 @@ 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);

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