From: Bernhard Walle This patch removes the crashkernel parsing from arch/x86_64/kernel/machine_kexec.c and calls the generic function, introduced in the last patch, in setup_bootmem_allocator(). This is necessary because the amount of System RAM must be known in this function now because of the new syntax. Signed-off-by: Bernhard Walle Signed-off-by: Andrew Morton --- arch/x86_64/kernel/setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN arch/x86_64/kernel/setup.c~use-extended-crashkernel-command-line-on-x86_64-update arch/x86_64/kernel/setup.c --- a/arch/x86_64/kernel/setup.c~use-extended-crashkernel-command-line-on-x86_64-update +++ a/arch/x86_64/kernel/setup.c @@ -197,11 +197,11 @@ static inline void copy_edd(void) #ifdef CONFIG_KEXEC static void __init reserve_crashkernel(void) { - unsigned long long free_mem; - unsigned long long crash_size, crash_base; - int ret; + unsigned long long free_mem; + unsigned long long crash_size, crash_base; + int ret; - free_mem = max_low_pfn << PAGE_SHIFT; + free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT; ret = parse_crashkernel(boot_command_line, free_mem, &crash_size, &crash_base); _