Make sure we populate the initroot filesystem late enough

We should not initialize rootfs before all the core initializers have
run.  So do it as a separate stage just before starting the regular
driver initializers.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 2 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 6e9fcebbf89f..7437ccaada77 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -242,6 +242,7 @@
         *(.initcall4s.init)                                             \
         *(.initcall5.init)                                              \
         *(.initcall5s.init)                                             \
+        *(.initcallrootfs.init)                                         \
         *(.initcall6.init)                                              \
         *(.initcall6s.init)                                             \
         *(.initcall7.init)                                              \
diff --git a/include/linux/init.h b/include/linux/init.h
index 5eb5d24b7680..5a593a1dec1e 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -111,6 +111,7 @@ extern void setup_arch(char **);
 #define subsys_initcall_sync(fn)        __define_initcall("4s",fn,4s)
 #define fs_initcall(fn)                 __define_initcall("5",fn,5)
 #define fs_initcall_sync(fn)            __define_initcall("5s",fn,5s)
+#define rootfs_initcall(fn)             __define_initcall("rootfs",fn,rootfs)
 #define device_initcall(fn)             __define_initcall("6",fn,6)
 #define device_initcall_sync(fn)        __define_initcall("6s",fn,6s)
 #define late_initcall(fn)               __define_initcall("7",fn,7)