Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1631840

[PATCH] um: Fix to call read_initrd after init_bootmem

Show all headers | View raw

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

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 arch/um/kernel/initrd.c  |    4 +---
 arch/um/kernel/um_arch.c |    6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 48bae81..6f6e789 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -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;
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 4b85acd..64a1fd0 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -338,11 +338,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);

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] um: Fix to call read_initrd after init_bootmem Masami Hiramatsu <mhiramat@kernel.org> - 2017-04-27 05:20 +0200
  Re: [PATCH] um: Fix to call read_initrd after init_bootmem Richard Weinberger <richard@nod.at> - 2017-04-27 16:00 +0200
    Re: [PATCH] um: Fix to call read_initrd after init_bootmem Masami Hiramatsu <mhiramat@kernel.org> - 2017-04-28 00:10 +0200
      Re: [PATCH] um: Fix to call read_initrd after init_bootmem Richard Weinberger <richard@nod.at> - 2017-04-28 00:50 +0200
      Re: [PATCH] um: Fix to call read_initrd after init_bootmem Masami Hiramatsu <mhiramat@kernel.org> - 2017-04-28 00:50 +0200
  Re: [PATCH] um: Fix to call read_initrd after init_bootmem Richard Weinberger <richard.weinberger@gmail.com> - 2017-05-03 23:00 +0200

csiph-web