Skip to content

Commit

Permalink
[PATCH] x86_64 bootmem: sparse_mem/kexec merge bug.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Aug 6, 2005
1 parent 36cf446 commit 0d317fb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/x86_64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 0d317fb

Please sign in to comment.