Commit 25714ddf authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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.
parent 08faf52b
...@@ -596,9 +596,15 @@ static int init(void * unused) ...@@ -596,9 +596,15 @@ static int init(void * unused)
do_pre_smp_initcalls(); do_pre_smp_initcalls();
smp_init(); smp_init();
do_basic_setup();
/*
* Do this before initcalls, because some drivers want to access
* firmware files.
*/
populate_rootfs(); populate_rootfs();
do_basic_setup();
/* /*
* check if there is an early userspace init. If yes, let it do all * check if there is an early userspace init. If yes, let it do all
* the work * the work
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment