[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.

diff --git a/init/main.c b/init/main.c
index 84cf96dddf4e6c82d780e99b06a73e7ae6831acd..77e962511616e62cb6b3e748de5ee2d4a495c58d 100644 (file)
--- 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