[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>
This commit is contained in:
Eric W. Biederman 2005-08-06 13:47:36 -06:00 коммит произвёл Linus Torvalds
Родитель 36cf446c2c
Коммит 0d317fb72f
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

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