diff options
| author | Tim Gardner <tim.gardner@canonical.com> | 2012-10-16 11:01:08 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:39 -0700 |
| commit | a16c3eb8e3cff0bafc657e7926727622ee1d5846 (patch) | |
| tree | 5ab3f7b57f93293790ee5614c4213c1f37628bff | |
| parent | 5c70c6a922604ea9dc569d33c56bdb5e72331755 (diff) | |
Revert "UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlier"
This reverts commit b00d4612b420ddb287ec15ea08d889e446789592.
| -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 79f2955364e..d1ea7ce0b4c 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -635,7 +635,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 ef222c37f18..8753767f9c5 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -208,7 +208,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); |