ia64/linux-2.6.18-xen.hg

changeset 612:4921b258e132

[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@valinux.co.jp>
author Isaku Yamahata <yamahata@valinux.co.jp>
date Mon Jul 28 17:22:45 2008 +0900 (2008-07-28)
parents ccfec88b3538
children 4d04f615e694
files arch/ia64/kernel/efi.c arch/ia64/mm/contig.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 @@ -21,6 +21,7 @@
     1.4   *	Skip non-WB memory and ignore empty memory ranges.
     1.5   */
     1.6  #include <linux/module.h>
     1.7 +#include <linux/bootmem.h>
     1.8  #include <linux/kernel.h>
     1.9  #include <linux/init.h>
    1.10  #include <linux/types.h>
    1.11 @@ -1015,6 +1016,11 @@ efi_memmap_init(unsigned long *s, unsign
    1.12  		} else
    1.13  			ae = efi_md_end(md);
    1.14  
    1.15 +#ifdef CONFIG_CRASH_DUMP
    1.16 +		/* saved_max_pfn should ignore max_addr= command line arg */
    1.17 +		if (saved_max_pfn < (ae >> PAGE_SHIFT))
    1.18 +			saved_max_pfn = (ae >> PAGE_SHIFT);
    1.19 +#endif
    1.20  		/* keep within max_addr= and min_addr= command line arg */
    1.21  		as = max(as, min_addr);
    1.22  		ae = min(ae, max_addr);
     2.1 --- a/arch/ia64/mm/contig.c	Mon Jul 28 17:22:45 2008 +0900
     2.2 +++ b/arch/ia64/mm/contig.c	Mon Jul 28 17:22:45 2008 +0900
     2.3 @@ -181,11 +181,6 @@ find_memory (void)
     2.4  
     2.5  	find_initrd();
     2.6  
     2.7 -#ifdef CONFIG_CRASH_DUMP
     2.8 -	/* If we are doing a crash dump, we still need to know the real mem
     2.9 -	 * size before original memory map is * reset. */
    2.10 -	saved_max_pfn = max_pfn;
    2.11 -#endif
    2.12  }
    2.13  
    2.14  #ifdef CONFIG_SMP