Use extended crashkernel command line on x86_64

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 <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 32 insertions, 7 deletions

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 5a19f0cc5b67..cdcba6975226 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -191,6 +191,37 @@ static inline void copy_edd(void)
 }
 #endif
 
+#ifdef CONFIG_KEXEC
+static void __init reserve_crashkernel(void)
+{
+        unsigned long long free_mem;
+        unsigned long long crash_size, crash_base;
+        int ret;
+
+        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);
+        if (ret == 0 && crash_size) {
+                if (crash_base > 0) {
+                        printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
+                                        "for crashkernel (System RAM: %ldMB)\n",
+                                        (unsigned long)(crash_size >> 20),
+                                        (unsigned long)(crash_base >> 20),
+                                        (unsigned long)(free_mem >> 20));
+                        crashk_res.start = crash_base;
+                        crashk_res.end   = crash_base + crash_size - 1;
+                        reserve_bootmem(crash_base, crash_size);
+                } else
+                        printk(KERN_INFO "crashkernel reservation failed - "
+                                        "you have to specify a base address\n");
+        }
+}
+#else
+static inline void __init reserve_crashkernel(void)
+{}
+#endif
+
 #define EBDA_ADDR_POINTER 0x40E
 
 unsigned __initdata ebda_addr;
@@ -357,13 +388,7 @@ void __init setup_arch(char **cmdline_p)
                 }
         }
 #endif
-#ifdef CONFIG_KEXEC
-        if (crashk_res.start != crashk_res.end) {
-                reserve_bootmem_generic(crashk_res.start,
-                        crashk_res.end - crashk_res.start + 1);
-        }
-#endif
-
+        reserve_crashkernel();
         paging_init();
 
 #ifdef CONFIG_PCI