diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 88638883176a..1a2901562059 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -90,7 +90,6 @@ | |||
90 | #include <asm/processor.h> | 90 | #include <asm/processor.h> |
91 | #include <asm/bugs.h> | 91 | #include <asm/bugs.h> |
92 | 92 | ||
93 | #include <asm/system.h> | ||
94 | #include <asm/vsyscall.h> | 93 | #include <asm/vsyscall.h> |
95 | #include <asm/cpu.h> | 94 | #include <asm/cpu.h> |
96 | #include <asm/desc.h> | 95 | #include <asm/desc.h> |
@@ -509,15 +508,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) | |||
509 | 508 | ||
510 | #ifdef CONFIG_KEXEC | 509 | #ifdef CONFIG_KEXEC |
511 | 510 | ||
512 | static inline unsigned long long get_total_mem(void) | ||
513 | { | ||
514 | unsigned long long total; | ||
515 | |||
516 | total = max_pfn - min_low_pfn; | ||
517 | |||
518 | return total << PAGE_SHIFT; | ||
519 | } | ||
520 | |||
521 | /* | 511 | /* |
522 | * Keep the crash kernel below this limit. On 32 bits earlier kernels | 512 | * Keep the crash kernel below this limit. On 32 bits earlier kernels |
523 | * would limit the kernel to the low 512 MiB due to mapping restrictions. | 513 | * would limit the kernel to the low 512 MiB due to mapping restrictions. |
@@ -536,7 +526,7 @@ static void __init reserve_crashkernel(void) | |||
536 | unsigned long long crash_size, crash_base; | 526 | unsigned long long crash_size, crash_base; |
537 | int ret; | 527 | int ret; |
538 | 528 | ||
539 | total_mem = get_total_mem(); | 529 | total_mem = memblock_phys_mem_size(); |
540 | 530 | ||
541 | ret = parse_crashkernel(boot_command_line, total_mem, | 531 | ret = parse_crashkernel(boot_command_line, total_mem, |
542 | &crash_size, &crash_base); | 532 | &crash_size, &crash_base); |