From 0e72e5a6e141eb1263a688db70d31ae6ade2c47d Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 24 Jan 2013 12:20:10 -0800 Subject: [PATCH] --- yaml --- r: 356254 b: refs/heads/master c: 7d41a8a4a2b2438621a9159477bff36a11d79a42 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b545ca76876e..a4a1f923dbd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 595ad9af8584908ea5fb698b836169d05b99f186 +refs/heads/master: 7d41a8a4a2b2438621a9159477bff36a11d79a42 diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index bbe8cdf7515e..4778ddeedc8a 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -501,13 +501,11 @@ static void __init memblock_x86_reserve_range_setup_data(void) /* * Keep the crash kernel below this limit. On 32 bits earlier kernels * would limit the kernel to the low 512 MiB due to mapping restrictions. - * On 64 bits, kexec-tools currently limits us to 896 MiB; increase this - * limit once kexec-tools are fixed. */ #ifdef CONFIG_X86_32 # define CRASH_KERNEL_ADDR_MAX (512 << 20) #else -# define CRASH_KERNEL_ADDR_MAX (896 << 20) +# define CRASH_KERNEL_ADDR_MAX MAXMEM #endif static void __init reserve_crashkernel(void)