diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-20 16:38:24 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-08-20 22:45:29 +0400 |
| commit | e229e0435b08c3743805c130c7c0756440f66363 (patch) | |
| tree | eb147e3ee60c3e59659ed60804f1a850c3cf20e1 | |
| parent | 250e09d6648d2740219bc400598c9691be0ae306 (diff) | |
| download | linux-topics-e229e0435b08c3743805c130c7c0756440f66363.tar.gz | |
Revert "b57a541 UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlier"
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 | ||||
| -rw-r--r-- | include/linux/init.h | 1 | ||||
| -rw-r--r-- | init/initramfs.c | 15 |
3 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index b5590e10b3a..4e2e1cc505a 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -626,7 +626,6 @@ *(.initcallearly.init) \ INIT_CALLS_LEVEL(0) \ INIT_CALLS_LEVEL(1) \ - INIT_CALLS_LEVEL(earlyrootfs) \ INIT_CALLS_LEVEL(2) \ INIT_CALLS_LEVEL(3) \ INIT_CALLS_LEVEL(4) \ diff --git a/include/linux/init.h b/include/linux/init.h index b8540f0988c..e8163edd1ba 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -197,7 +197,6 @@ extern bool initcall_debug; #define core_initcall(fn) __define_initcall("1",fn,1) #define core_initcall_sync(fn) __define_initcall("1s",fn,1s) -#define earlyrootfs_initcall(fn) __define_initcall("earlyrootfs",fn,rootfs) #define postcore_initcall(fn) __define_initcall("2",fn,2) #define postcore_initcall_sync(fn) __define_initcall("2s",fn,2s) #define arch_initcall(fn) __define_initcall("3",fn,3) diff --git a/init/initramfs.c b/init/initramfs.c index 1ae8873570c..928a3f2b81d 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -622,22 +622,9 @@ 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) { - if (!rootfs_populated) - async_schedule_domain(async_populate_rootfs, NULL, - &populate_rootfs_domain); + async_schedule_domain(async_populate_rootfs, NULL, &populate_rootfs_domain); } -earlyrootfs_initcall(populate_rootfs_early); rootfs_initcall(populate_rootfs); |