Skip to contentSkip to conversation

x86_64: reserve crashkernel bootmem before reserve dma32 bootmem

PATCH In review Yinghai Lu 2 participants 2 messages Jul 14, 2008 – Jul 15, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86_64: reserve crashkernel bootmem before reserve dma32 bootmem

From: Joe Jin <[email protected]>

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.

---
 arch/x86/kernel/setup_64.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/setup_64.c +2 -2
Index: 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();
#1 lore raw

Yinghai, thanks!

Quoted 37 lines · Yinghai Lu

From: Joe Jin <[email protected]>

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.

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

Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================

arch/x86/kernel/setup_64.c +2 -2
@@ -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();