diff options
| author | Tim Gardner <tim.gardner@canonical.com> | 2012-10-16 11:01:23 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:39 -0700 |
| commit | c9b62657738d2f46ff632860187614178491bdea (patch) | |
| tree | c9f00252da2112c617e7c8cf44e12adba887c13b /init/initramfs.c | |
| parent | a16c3eb8e3cff0bafc657e7926727622ee1d5846 (diff) | |
Revert "UBUNTU: SAUCE: Make populate_rootfs asynchronous"
This reverts commit 56e68a641786719fbc90584b988f75c659e3d15b.
Diffstat (limited to 'init/initramfs.c')
| -rw-r--r-- | init/initramfs.c | 15 |
1 files changed, 3 insertions, 12 deletions
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 <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); |