tracing/ftrace: launch boot tracing after pre-smp initcalls

Launch the boot tracing inside the initcall_debug area. Old printk
have not been removed to keep the old way of initcall tracing for
backward compatibility.

[ mingo@elte.hu: resolved conflicts ]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/init/main.c b/init/main.c
index 16abba05c8269215502463fe85f3e70091194b07..1e39a1eab1900b7b336323b9ac97d82570e05ec5 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -709,10 +709,12 @@ int do_one_initcall(initcall_t fn)
        ktime_t t0, t1, delta;
        char msgbuf[64];
        int result;
+       struct boot_trace it;
 
        if (initcall_debug) {
-               printk("calling  %pF", fn);
-               printk(" @ %i\n",  task_pid_nr(current));
+               it.caller = task_pid_nr(current);
+               it.func = fn;
+               printk("calling  %pF @ %i\n", fn, it.caller);
                t0 = ktime_get();
        }
 
@@ -721,10 +723,11 @@ int do_one_initcall(initcall_t fn)
        if (initcall_debug) {
                t1 = ktime_get();
                delta = ktime_sub(t1, t0);
-
-               printk("initcall %pF returned %d after %Ld msecs\n",
-                       fn, result,
-                       (unsigned long long) delta.tv64 >> 20);
+               it.result = result;
+               it.duration = (unsigned long long) delta.tv64 >> 20;
+               printk("initcall %pF returned %d after %Ld msecs\n", fn,
+                       result, it.duration);
+               trace_boot(&it);
        }
 
        msgbuf[0] = 0;
@@ -859,6 +862,7 @@ static int __init kernel_init(void * unused)
        smp_prepare_cpus(setup_max_cpus);
 
        do_pre_smp_initcalls();
+       start_boot_trace();
 
        smp_init();
        sched_init_smp();