diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 12:28:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 12:28:02 -0700 |
commit | 2d51b75370d83535883c66521b03fcd6a1f1f68d (patch) | |
tree | 68e7bb018a80207781719795828434dfcf3b9bf6 /init/main.c | |
parent | 93f78da405685a756beeaeae4b5e41fcec39eab3 (diff) | |
parent | ce52aebd0219edc7a783278fbe80a6ccca0556c0 (diff) | |
download | lwn-2d51b75370d83535883c66521b03fcd6a1f1f68d.tar.gz lwn-2d51b75370d83535883c66521b03fcd6a1f1f68d.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot:
raid, fastboot: hide RAID autodetect option if MD is compiled as a module
raid: make RAID autodetect default a KConfig option
warning: fix init do_mounts_md c
fastboot: make the RAID autostart code print a message just before waiting
fastboot: make the raid autodetect code wait for all devices to init
fastboot: Fix bootgraph.pl initcall name regexp
fastboot: fix issues and improve output of bootgraph.pl
Add a script to visualize the kernel boot process / time
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 3820323c4c84..27f6bf6108e9 100644 --- a/init/main.c +++ b/init/main.c @@ -708,7 +708,7 @@ int do_one_initcall(initcall_t fn) int result; if (initcall_debug) { - printk("calling %pF\n", fn); + printk("calling %pF @ %i\n", fn, task_pid_nr(current)); t0 = ktime_get(); } |