UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlier

[linux-flexiantxendom0-natty.git] / init / initramfs.c

diff --git a/init/initramfs.c b/init/initramfs.c
index 22712f9..1ecfa05 100644 (file)
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -612,9 +612,22 @@ static void __init async_populate_rootfs(void)
        return;
 }
 
+static int __initdata rootfs_populated;
+
+static int __init populate_rootfs_early(void)
+{
+       if (num_online_cpus() > 1) {
+               rootfs_populated = 1;
+               async_schedule_domain(async_populate_rootfs, NULL,
+                                               &populate_rootfs_domain);
+       }
+}
 static int __init populate_rootfs(void)
 {
-       async_schedule_domain(async_populate_rootfs, NULL, &populate_rootfs_domain);
+       if (!rootfs_populated)
+               async_schedule_domain(async_populate_rootfs, NULL,
+                                               &populate_rootfs_domain);
 }
 
+earlyrootfs_initcall(populate_rootfs_early);
 rootfs_initcall(populate_rootfs);