2 files changed, 39 insertions, 26 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index af10db90a554..18a5baf2cbad 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -140,19 +140,26 @@ static void __init reserve_crashkernel(void)
         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,
-                                        BOOTMEM_DEFAULT);
-                } else
+                if (crash_base <= 0) {
                         printk(KERN_INFO "crashkernel reservation failed - "
                                         "you have to specify a base address\n");
+                        return;
+                }
+
+                if (reserve_bootmem(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)(free_mem >> 20));
+                crashk_res.start = crash_base;
+                crashk_res.end   = crash_base + crash_size - 1;
         }
 }
 #else
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 8345c3b12f05..a49f5f734a5e 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -220,29 +220,35 @@ static inline void copy_edd(void)
 #ifdef CONFIG_KEXEC
 static void __init reserve_crashkernel(void)
 {
-        unsigned long long free_mem;
+        unsigned long long total_mem;
         unsigned long long crash_size, crash_base;
         int ret;
 
-        free_mem =
-                ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;
+        total_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;
 
-        ret = parse_crashkernel(boot_command_line, free_mem,
+        ret = parse_crashkernel(boot_command_line, total_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,
-                                        BOOTMEM_DEFAULT);
-                } else
+                if (crash_base <= 0) {
                         printk(KERN_INFO "crashkernel reservation failed - "
                                         "you have to specify a base address\n");
+                        return;
+                }
+
+                if (reserve_bootmem(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;
         }
 }
 #else