From c9b62657738d2f46ff632860187614178491bdea Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 16 Oct 2012 11:01:23 -0600 Subject: Revert "UBUNTU: SAUCE: Make populate_rootfs asynchronous" This reverts commit 56e68a641786719fbc90584b988f75c659e3d15b. --- init/initramfs.c | 15 +++------------ init/main.c | 6 ------ 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'init') diff --git a/init/initramfs.c b/init/initramfs.c index 928a3f2b81d..84c6bf11130 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -18,7 +18,6 @@ #include #include #include -#include static __initdata char *message; static void __init error(char *x) @@ -580,9 +579,7 @@ static void __init clean_rootfs(void) } #endif -LIST_HEAD(populate_rootfs_domain); - -static void __init async_populate_rootfs(void) +static int __init populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); if (err) @@ -595,7 +592,7 @@ static void __init async_populate_rootfs(void) initrd_end - initrd_start); if (!err) { free_initrd(); - return; + return 0; } else { clean_rootfs(); unpack_to_rootfs(__initramfs_start, __initramfs_size); @@ -619,12 +616,6 @@ static void __init async_populate_rootfs(void) free_initrd(); #endif } - return; -} - -static int __init populate_rootfs(void) -{ - async_schedule_domain(async_populate_rootfs, NULL, &populate_rootfs_domain); + return 0; } - rootfs_initcall(populate_rootfs); diff --git a/init/main.c b/init/main.c index ccd91c5ba7a..4c5e207d125 100644 --- a/init/main.c +++ b/init/main.c @@ -900,12 +900,6 @@ static void __init kernel_init_freeable(void) (void) sys_dup(0); (void) sys_dup(0); - /* - * We need to ensure that the filesystem is ready by this point, wait for - * async_populate_rootfs to complete. - */ - async_synchronize_full_domain(&populate_rootfs_domain); - /* * check if there is an early userspace init. If yes, let it do all * the work -- cgit v1.2.3