diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-20 16:39:55 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-20 22:45:58 +0400 |
| commit | ac20a0e853ca73bb821a85d8492d965e07513ccd (patch) | |
| tree | b609d075d807f74cc40ecd420c3b2b33c5c788fd | |
| parent | e229e0435b08c3743805c130c7c0756440f66363 (diff) | |
Revert a1f6335 "UBUNTU: SAUCE: Make populate_rootfs asynchronous"tracking-workaround-ubuntu-sauce-llct-20120820.1
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | include/linux/init.h | 2 | ||||
| -rw-r--r-- | init/initramfs.c | 15 | ||||
| -rw-r--r-- | init/main.c | 6 |
3 files changed, 3 insertions, 20 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index e8163edd1ba8..5e664f671615 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -224,8 +224,6 @@ extern bool initcall_debug; static initcall_t __initcall_##fn \ __used __section(.security_initcall.init) = fn -extern struct list_head populate_rootfs_domain; - struct obs_kernel_param { const char *str; int (*setup_func)(char *); diff --git a/init/initramfs.c b/init/initramfs.c index 928a3f2b81da..84c6bf111300 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -18,7 +18,6 @@ #include <linux/dirent.h> #include <linux/syscalls.h> #include <linux/utime.h> -#include <linux/async.h> 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 2deae100e2a6..2173f4c9cbbd 100644 --- a/init/main.c +++ b/init/main.c @@ -892,12 +892,6 @@ static int __init kernel_init(void * unused) (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 */ |