diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:35:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:35:47 -0800 |
| commit | 67acd8b4b7a3f1b183ae358e1dfdb8a80e170736 (patch) | |
| tree | 4418034f6e83f954337a17bc6a872fa5ae3c4b5e /init | |
| parent | b13d3720ecd29d5044334fdbbae3432f26802bae (diff) | |
| parent | ad160d23198193135cb2bcc75222e0816b5838c0 (diff) | |
| download | linux-3.10-67acd8b4b7a3f1b183ae358e1dfdb8a80e170736.tar.gz linux-3.10-67acd8b4b7a3f1b183ae358e1dfdb8a80e170736.tar.bz2 linux-3.10-67acd8b4b7a3f1b183ae358e1dfdb8a80e170736.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async:
async: don't do the initcall stuff post boot
bootchart: improve output based on Dave Jones' feedback
async: make the final inode deletion an asynchronous event
fastboot: Make libata initialization even more async
fastboot: make the libata port scan asynchronous
fastboot: make scsi probes asynchronous
async: Asynchronous function calls to speed up kernel boot
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 2 | ||||
| -rw-r--r-- | init/main.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 5efca73b39f..708105e163d 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/initrd.h> +#include <linux/async.h> #include <linux/nfs_fs.h> #include <linux/nfs_fs_sb.h> @@ -372,6 +373,7 @@ void __init prepare_namespace(void) /* wait for the known devices to complete their probing */ while (driver_probe_done() != 0) msleep(100); + async_synchronize_full(); md_run_setup(); diff --git a/init/main.c b/init/main.c index 05b31328331..844209453c0 100644 --- a/init/main.c +++ b/init/main.c @@ -62,6 +62,7 @@ #include <linux/signal.h> #include <linux/idr.h> #include <linux/ftrace.h> +#include <linux/async.h> #include <trace/boot.h> #include <asm/io.h> @@ -685,7 +686,7 @@ asmlinkage void __init start_kernel(void) rest_init(); } -static int initcall_debug; +int initcall_debug; core_param(initcall_debug, initcall_debug, bool, 0644); int do_one_initcall(initcall_t fn) @@ -786,6 +787,8 @@ static void run_init_process(char *init_filename) */ static noinline int init_post(void) { + /* need to finish all async __init code before freeing the memory */ + async_synchronize_full(); free_initmem(); unlock_kernel(); mark_rodata_ro(); |