summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-08-06 13:47:36 -0600
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-06 13:06:30 -0700
commit0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66 (patch)
tree10d49c7f5dce5c7f1ec4ddd6572490827be874cf /arch/x86_64
parent36cf446c2c4be6bae01517ea539dcebaf85c9fdf (diff)
downloadop-kernel-dev-0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66.zip
op-kernel-dev-0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66.tar.gz
[PATCH] 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. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 0aa5262..116a491 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -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();
OpenPOWER on IntegriCloud