From d391b47ae4f0043ab7f98ca23d9d1394818376b0 Mon Sep 17 00:00:00 2001 From: Dave Young Date: Wed, 28 Mar 2012 14:42:47 -0700 Subject: [PATCH] --- yaml --- r: 297275 b: refs/heads/master c: 09c71bfd8384278c42f56380365940508194cec0 h: refs/heads/master i: 297273: fa8064c16ba8cab7662362a79554c70c838f417e 297271: 8a6530f5c8982e555a9be11c3241a8a3fe45eff4 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 10e06b2d991f..1d87bd7c725b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eaa3be6add6f327ab0a633e4fee8e6f2cc8c8a4c +refs/heads/master: 09c71bfd8384278c42f56380365940508194cec0 diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c index 88638883176a..ab77aae4ad9b 100644 --- a/trunk/arch/x86/kernel/setup.c +++ b/trunk/arch/x86/kernel/setup.c @@ -509,15 +509,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) #ifdef CONFIG_KEXEC -static inline unsigned long long get_total_mem(void) -{ - unsigned long long total; - - total = max_pfn - min_low_pfn; - - return total << PAGE_SHIFT; -} - /* * 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. @@ -536,7 +527,7 @@ static void __init reserve_crashkernel(void) unsigned long long crash_size, crash_base; int ret; - total_mem = get_total_mem(); + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);