um: Fix to call read_initrd after init_bootmem
authorMasami Hiramatsu <mhiramat@kernel.org>
Thu, 27 Apr 2017 03:15:10 +0000 (12:15 +0900)
committerRichard Weinberger <richard@nod.at>
Wed, 3 May 2017 20:38:16 +0000 (22:38 +0200)
commit5b4236e17cc1bd9fa14b2b0c7a4ae632d41f2e20
treeece1dff46ebb0f66add8226030fdc1addbf0d526
parent601b7b9147455a4d8d80d04f0e5a1eb222301bbe
um: Fix to call read_initrd after init_bootmem

Since read_initrd() invokes alloc_bootmem() for allocating
memory to load initrd image, it must be called after init_bootmem.

This makes read_initrd() called directly from setup_arch()
after init_bootmem() and mem_total_pages().

Cc: <stable@vger.kernel.org>
Fixes: b63236972e1 ("um: Setup physical memory in setup_arch()")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/kernel/initrd.c
arch/um/kernel/um_arch.c