[PATCH] x86_64: reserve crashkernel bootmem before reserve dma32 bootmem

Yinghai Lu
2008-07-14T17:17:28Z

From: Joe Jin <joe.jin@oracle.com>

Before reserve_crashkernel, dma32_reserve_bootmem would reserve 128M memory.
this cuased crashkernel end address must less than 64M or start address must
more than 192M except crashkernel memory reserved before dma32 memory reserved.

Signed-off-by: Joe Jin <joe.jin@oracle.com>
Acked-by: Yinghai Lu <yhlu.kernel@gmail.com>
Acked-by: Ingo Molnar <mingo@elte.hu>

---
arch/x86/kernel/setup_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -444,8 +444,6 @@ void __init setup_arch(char **cmdline_p)
contig_initmem_init(0, end_pfn);
#endif

- dma32_reserve_bootmem();
-
#ifdef CONFIG_ACPI_SLEEP
/*
* Reserve low memory region for sleep support.
@@ -486,6 +484,8 @@ void __init setup_arch(char **cmdline_p)
#endif
reserve_crashkernel();

+ dma32_reserve_bootmem();
+
reserve_ibft_region();

paging_init();