x86: move back crashkernel back to setup.c

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 57 deletions

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 2f807503e030..a3a19ab0edef 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -387,63 +387,6 @@ EXPORT_SYMBOL(node_to_cpumask);
 
 #endif /* X86_64_NUMA */
 
-
-/*
- * --------- Crashkernel reservation ------------------------------
- */
-
-static inline unsigned long long get_total_mem(void)
-{
-        unsigned long long total;
-
-        total = max_low_pfn - min_low_pfn;
-#ifdef CONFIG_HIGHMEM
-        total += highend_pfn - highstart_pfn;
-#endif
-
-        return total << PAGE_SHIFT;
-}
-
-#ifdef CONFIG_KEXEC
-void __init reserve_crashkernel(void)
-{
-        unsigned long long total_mem;
-        unsigned long long crash_size, crash_base;
-        int ret;
-
-        total_mem = get_total_mem();
-
-        ret = parse_crashkernel(boot_command_line, total_mem,
-                        &crash_size, &crash_base);
-        if (ret == 0 && crash_size > 0) {
-                if (crash_base <= 0) {
-                        printk(KERN_INFO "crashkernel reservation failed - "
-                                        "you have to specify a base address\n");
-                        return;
-                }
-
-                if (reserve_bootmem_generic(crash_base, crash_size,
-                                        BOOTMEM_EXCLUSIVE) < 0) {
-                        printk(KERN_INFO "crashkernel reservation failed - "
-                                        "memory is in use\n");
-                        return;
-                }
-
-                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)(total_mem >> 20));
-
-                crashk_res.start = crash_base;
-                crashk_res.end   = crash_base + crash_size - 1;
-                insert_resource(&iomem_resource, &crashk_res);
-        }
-}
-#else
-void __init reserve_crashkernel(void)
-{}
-#endif
 static struct resource standard_io_resources[] = {
         { .name = "dma1", .start = 0x00, .end = 0x1f,
                 .flags = IORESOURCE_BUSY | IORESOURCE_IO },