[IA64] point saved_max_pfn to the max_pfn of the entire system
Make saved_max_pfn point to max_pfn of entire system. Without this patch is so that vmcore is zero length on ia64. This is because saved_max_pfn was wrongly being set to the max_pfn of the crash kernel's address space, rather than the max_pfg on the physical memory of the machine - the whole purpose of vmcore is to access physical memory that is not part of the crash kernel's addresss space. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Zou Nan hai <nanhai.zou@intel.com> Sort-Of-Acked-By: Jay Lan <jlan@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
* Skip non-WB memory and ignore empty memory ranges.
|
* Skip non-WB memory and ignore empty memory ranges.
|
||||||
*/
|
*/
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
#include <linux/bootmem.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
@@ -1009,6 +1010,11 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
|
|||||||
} else
|
} else
|
||||||
ae = efi_md_end(md);
|
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 */
|
/* keep within max_addr= and min_addr= command line arg */
|
||||||
as = max(as, min_addr);
|
as = max(as, min_addr);
|
||||||
ae = min(ae, max_addr);
|
ae = min(ae, max_addr);
|
||||||
|
@@ -197,11 +197,6 @@ find_memory (void)
|
|||||||
|
|
||||||
find_initrd();
|
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
|
#ifdef CONFIG_SMP
|
||||||
|
@@ -480,12 +480,6 @@ void __init find_memory(void)
|
|||||||
max_pfn = max_low_pfn;
|
max_pfn = max_low_pfn;
|
||||||
|
|
||||||
find_initrd();
|
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
|
#ifdef CONFIG_SMP
|
||||||
|
Reference in New Issue
Block a user