ia64/linux-2.6.18-xen.hg

changeset 613:4d04f615e694

[IA64] backport Pick highest possible saved_max_pfn for crash_dump

backport Upstream Linux changeset e55fdf11f3029bcd41b1b9547ad9db12c27eea76

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Isaku Yamahata <yamahata@valinux.co.jp>
date Mon Jul 28 17:22:45 2008 +0900 (2008-07-28)
parents 4921b258e132
children 34905b87bb83
files arch/ia64/kernel/efi.c
line diff
     1.1 --- a/arch/ia64/kernel/efi.c	Mon Jul 28 17:22:45 2008 +0900
     1.2 +++ b/arch/ia64/kernel/efi.c	Mon Jul 28 17:22:45 2008 +0900
     1.3 @@ -977,6 +977,11 @@ efi_memmap_init(unsigned long *s, unsign
     1.4  		if (!is_available_memory(md))
     1.5  			continue;
     1.6  
     1.7 +#ifdef CONFIG_CRASH_DUMP
     1.8 +		/* saved_max_pfn should ignore max_addr= command line arg */
     1.9 +		if (saved_max_pfn < (efi_md_end(md) >> PAGE_SHIFT))
    1.10 +			saved_max_pfn = (efi_md_end(md) >> PAGE_SHIFT);
    1.11 +#endif
    1.12  		/*
    1.13  		 * Round ends inward to granule boundaries
    1.14  		 * Give trimmings to uncached allocator
    1.15 @@ -1016,11 +1021,6 @@ efi_memmap_init(unsigned long *s, unsign
    1.16  		} else
    1.17  			ae = efi_md_end(md);
    1.18  
    1.19 -#ifdef CONFIG_CRASH_DUMP
    1.20 -		/* saved_max_pfn should ignore max_addr= command line arg */
    1.21 -		if (saved_max_pfn < (ae >> PAGE_SHIFT))
    1.22 -			saved_max_pfn = (ae >> PAGE_SHIFT);
    1.23 -#endif
    1.24  		/* keep within max_addr= and min_addr= command line arg */
    1.25  		as = max(as, min_addr);
    1.26  		ae = min(ae, max_addr);