[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>

authored by Eric W. Biederman and committed by Linus Torvalds 0d317fb7 36cf446c

+3 -3
+3 -3
arch/x86_64/kernel/setup.c
··· 645 645 } 646 646 } 647 647 #endif 648 - 649 - sparse_init(); 650 - 651 648 #ifdef CONFIG_KEXEC 652 649 if (crashk_res.start != crashk_res.end) { 653 650 reserve_bootmem(crashk_res.start, 654 651 crashk_res.end - crashk_res.start + 1); 655 652 } 656 653 #endif 654 + 655 + sparse_init(); 656 + 657 657 paging_init(); 658 658 659 659 check_ioapic();