Merge branch 'core/xen' into x86/xen

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index a35207655e7b..de832056bf1b 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -171,6 +171,7 @@ static void __init reserve_crashkernel(void)
                                 (unsigned long)(free_mem >> 20));
                 crashk_res.start = crash_base;
                 crashk_res.end   = crash_base + crash_size - 1;
+                insert_resource(&iomem_resource, &crashk_res);
         }
 }
 #else
@@ -204,11 +205,6 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
         request_resource(res, &data_resource);
         request_resource(res, &bss_resource);
 
-#ifdef CONFIG_KEXEC
-        if (crashk_res.start != crashk_res.end)
-                request_resource(res, &crashk_res);
-#endif
-
         add_active_range(nid, start_pfn, end_pfn);
 }