1 files changed, 9 insertions, 4 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index bf89e0a59b88..b11a238b2e35 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -502,6 +502,7 @@ static inline unsigned long long get_total_mem(void)
         return total << PAGE_SHIFT;
 }
 
+#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF
 static void __init reserve_crashkernel(void)
 {
         unsigned long long total_mem;
@@ -519,8 +520,12 @@ static void __init reserve_crashkernel(void)
         if (crash_base <= 0) {
                 const unsigned long long alignment = 16<<20;    /* 16M */
 
-                crash_base = memblock_find_in_range(alignment, ULONG_MAX, crash_size,
-                                 alignment);
+                /*
+                 *  kexec want bzImage is below DEFAULT_BZIMAGE_ADDR_MAX
+                 */
+                crash_base = memblock_find_in_range(alignment,
+                               DEFAULT_BZIMAGE_ADDR_MAX, crash_size, alignment);
+
                 if (crash_base == MEMBLOCK_ERROR) {
                         pr_info("crashkernel reservation failed - No suitable area found.\n");
                         return;
@@ -528,8 +533,8 @@ static void __init reserve_crashkernel(void)
         } else {
                 unsigned long long start;
 
-                start = memblock_find_in_range(crash_base, ULONG_MAX, crash_size,
-                                 1<<20);
+                start = memblock_find_in_range(crash_base,
+                                 crash_base + crash_size, crash_size, 1<<20);
                 if (start != crash_base) {
                         pr_info("crashkernel reservation failed - memory is in use.\n");
                         return;