tracing/fastboot: move boot tracer structs and funcs into their own header.

[safe/jmp/linux-2.6] / init / main.c

diff --git a/init/main.c b/init/main.c
index 672ae75..16ca1ee 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -63,6 +63,7 @@
 #include <linux/signal.h>
 #include <linux/idr.h>
 #include <linux/ftrace.h>
+#include <trace/boot.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -672,7 +673,6 @@ asmlinkage void __init start_kernel(void)
        fork_init(num_physpages);
        proc_caches_init();
        buffer_init();
-       unnamed_dev_init();
        key_init();
        security_init();
        vfs_caches_init(num_physpages);
@@ -699,13 +699,7 @@ asmlinkage void __init start_kernel(void)
 }
 
 static int initcall_debug;
-
-static int __init initcall_debug_setup(char *str)
-{
-       initcall_debug = 1;
-       return 1;
-}
-__setup("initcall_debug", initcall_debug_setup);
+core_param(initcall_debug, initcall_debug, bool, 0644);
 
 int do_one_initcall(initcall_t fn)
 {
@@ -718,6 +712,7 @@ int do_one_initcall(initcall_t fn)
                it.caller = task_pid_nr(current);
                printk("calling  %pF @ %i\n", fn, it.caller);
                it.calltime = ktime_get();
+               enable_boot_trace();
        }
 
        it.result = fn();
@@ -729,6 +724,7 @@ int do_one_initcall(initcall_t fn)
                printk("initcall %pF returned %d after %Ld usecs\n", fn,
                        it.result, it.duration);
                trace_boot(&it, fn);
+               disable_boot_trace();
        }
 
        msgbuf[0] = 0;
@@ -775,7 +771,6 @@ static void __init do_initcalls(void)
 static void __init do_basic_setup(void)
 {
        rcu_init_sched(); /* needed by module_init stage. */
-       /* drivers will send hotplug events */
        init_workqueues();
        usermodehelper_init();
        driver_init();
@@ -890,7 +885,7 @@ static int __init kernel_init(void * unused)
         * we're essentially up and running. Get rid of the
         * initmem segments and start the user-mode stuff..
         */
-       stop_boot_trace();
+
        init_post();
        return 0;
 }