diff options
| author | Eric W. Biederman | 2005-08-06 21:47:36 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-08-06 22:06:30 +0200 |
| commit | 0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66 (patch) | |
| tree | 10d49c7f5dce5c7f1ec4ddd6572490827be874cf /arch | |
| parent | [PATCH] i386 visws: Add machine_shutdown and emergency_restart (diff) | |
| download | kernel-qcow2-linux-0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66.tar.gz kernel-qcow2-linux-0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66.tar.xz kernel-qcow2-linux-0d317fb72fe3cf0f611608cf3a3015bbe6cd2a66.zip | |
[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')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0aa526298e92..116a491e2961 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(); |