[PATCH] run populate_rootfs() before initcalls

I moved this a little too late - we need to run populate_rootfs() before
running initcalls because some driver initcalls need to open files for
firmware.

The populate_rootfs() call is still coming after init_idle(), so it won't
knock the scheduler over.

1 files changed, 7 insertions, 1 deletions

diff --git a/init/main.c b/init/main.c
index 84cf96dddf4e6c..77e962511616e6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -596,9 +596,15 @@ static int init(void * unused)
 	do_pre_smp_initcalls();
 
 	smp_init();
-	do_basic_setup();
 
+	/*
+	 * Do this before initcalls, because some drivers want to access
+	 * firmware files.
+	 */
 	populate_rootfs();
+
+	do_basic_setup();
+
 	/*
 	 * check if there is an early userspace init.  If yes, let it do all
 	 * the work