Skip to contentSkip to conversation

x86_64 bootmem: sparse_mem/kexec merge bug.

PATCH New Eric W. Biederman 1 participant 1 message Aug 6, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86_64 bootmem: sparse_mem/kexec merge bug.

When the sparse mem changes and the kexec changes were merged into setup.c they came in, in the wrong order. This patch changes the order so we don't run sparse_init which uses the bootmem allocator until we all of the reserve_bootmem calls has been made.

---

 arch/x86_64/kernel/setup.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

a5873c00a7da0ebb5c192f89382ef382602bd396

arch/x86_64/kernel/setup.c +3 -3
@@ -645,15 +645,15 @@ void __init setup_arch(char **cmdline_p)
 		}
 	}
 #endif
-
-	sparse_init();
-
 #ifdef CONFIG_KEXEC
 	if (crashk_res.start != crashk_res.end) {
 		reserve_bootmem(crashk_res.start,
 			crashk_res.end - crashk_res.start + 1);
 	}
 #endif
+
+	sparse_init();
+
 	paging_init();
 
 	check_ioapic();