um: Fix to call read_initrd after init_bootmem

commit 5b4236e17c upstream.

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().

Fixes: b63236972e ("um: Setup physical memory in setup_arch()")
Signed-off-by: Masami Hiramatsu <>
Signed-off-by: Richard Weinberger <>
Signed-off-by: Greg Kroah-Hartman <>
Masami Hiramatsu 6 years ago committed by Greg Kroah-Hartman
parent 541c678441
commit cc0aa21de4

@ -14,7 +14,7 @@
static char *initrd __initdata = NULL;
static int load_initrd(char *filename, void *buf, int size);
static int __init read_initrd(void)
int __init read_initrd(void)
void *area;
long long size;
@ -46,8 +46,6 @@ static int __init read_initrd(void)
return 0;
static int __init uml_initrd_setup(char *line, int *add)
initrd = line;

@ -336,11 +336,17 @@ int __init linux_main(int argc, char **argv)
return start_uml();
int __init __weak read_initrd(void)
return 0;
void __init setup_arch(char **cmdline_p)
stack_protections((unsigned long) &init_thread_info);
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
mem_total_pages(physmem_size, iomem_size, highmem);
strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);