Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0aa21d authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Greg Kroah-Hartman
Browse files

um: Fix to call read_initrd after init_bootmem 



commit 5b4236e17cc1bd9fa14b2b0c7a4ae632d41f2e20 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: b6323697 ("um: Setup physical memory in setup_arch()")
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 541c6784

arch/um/kernel/initrd.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}



__uml_postsetup(read_initrd);



static int __init uml_initrd_setup(char *line, int *add)

{

	initrd = line;

arch/um/kernel/um_arch.c

+6 −0
Original line number Diff line number Diff 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);

	read_initrd();



	paging_init();

	strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);