From: Bernhard Walle This patch adapts IA64 to use the generic parse_crashkernel() function instead of its own parsing for the crashkernel command line. Because the total amount of System RAM must be known when calling this function, efi_memmap_init() is modified to return its accumulated total_memory variable. Also, the crashkernel handling is moved in an own function in arch/ia64/kernel/setup.c to make the code more readable. Signed-off-by: Bernhard Walle Signed-off-by: Andrew Morton --- arch/ia64/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/ia64/kernel/efi.c~use-extended-crashkernel-command-line-on-ia64-update arch/ia64/kernel/efi.c diff -puN arch/ia64/kernel/setup.c~use-extended-crashkernel-command-line-on-ia64-update arch/ia64/kernel/setup.c --- a/arch/ia64/kernel/setup.c~use-extended-crashkernel-command-line-on-ia64-update +++ a/arch/ia64/kernel/setup.c @@ -261,7 +261,7 @@ void __init reserve_memory (void) { int n = 0; - unsigned long total_memory = 0; + unsigned long total_memory; /* * none of the entries in this table overlap _