tracing: Remove boot tracer

The boot tracer is useless. It simply logs the initcalls
but in fact these initcalls are also logged through printk
while using the initcall_debug kernel parameter.

Nobody seem to be using it so far. Then just remove it.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Chase Douglas <chase.douglas@canonical.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <20100526105753.GA5677@cr0.nay.redhat.com>
[ remove the hooks in main.c, and the headers ]
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

1 files changed, 10 insertions, 17 deletions

diff --git a/init/main.c b/init/main.c
index 3bdb152f412..94f65efdc65 100644
--- a/init/main.c
+++ b/init/main.c
@@ -70,7 +70,6 @@
 #include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
-#include <trace/boot.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -715,38 +714,33 @@ int initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
 
 static char msgbuf[64];
-static struct boot_trace_call call;
-static struct boot_trace_ret ret;
 
 int do_one_initcall(initcall_t fn)
 {
         int count = preempt_count();
         ktime_t calltime, delta, rettime;
+        unsigned long long duration;
+        int ret;
 
         if (initcall_debug) {
-                call.caller = task_pid_nr(current);
-                printk("calling  %pF @ %i\n", fn, call.caller);
+                printk("calling  %pF @ %i\n", fn, task_pid_nr(current));
                 calltime = ktime_get();
-                trace_boot_call(&call, fn);
-                enable_boot_trace();
         }
 
-        ret.result = fn();
+        ret = fn();
 
         if (initcall_debug) {
-                disable_boot_trace();
                 rettime = ktime_get();
                 delta = ktime_sub(rettime, calltime);
-                ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
-                trace_boot_ret(&ret, fn);
-                printk("initcall %pF returned %d after %Ld usecs\n", fn,
-                        ret.result, ret.duration);
+                duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+                printk("initcall %pF returned %d after %lld usecs\n", fn,
+                        ret, duration);
         }
 
         msgbuf[0] = 0;
 
-        if (ret.result && ret.result != -ENODEV && initcall_debug)
-                sprintf(msgbuf, "error code %d ", ret.result);
+        if (ret && ret != -ENODEV && initcall_debug)
+                sprintf(msgbuf, "error code %d ", ret);
 
         if (preempt_count() != count) {
                 strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
@@ -760,7 +754,7 @@ int do_one_initcall(initcall_t fn)
                 printk("initcall %pF returned with %s\n", fn, msgbuf);
         }
 
-        return ret.result;
+        return ret;
 }
 
 
@@ -880,7 +874,6 @@ 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();