Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)
  sched, trace: update trace_sched_wakeup()
  tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
  Revert "x86: disable X86_PTRACE_BTS"
  ring-buffer: prevent false positive warning
  ring-buffer: fix dangling commit race
  ftrace: enable format arguments checking
  x86, bts: memory accounting
  x86, bts: add fork and exit handling
  ftrace: introduce tracing_reset_online_cpus() helper
  tracing: fix warnings in kernel/trace/trace_sched_switch.c
  tracing: fix warning in kernel/trace/trace.c
  tracing/ring-buffer: remove unused ring_buffer size
  trace: fix task state printout
  ftrace: add not to regex on filtering functions
  trace: better use of stack_trace_enabled for boot up code
  trace: add a way to enable or disable the stack tracer
  x86: entry_64 - introduce FTRACE_ frame macro v2
  tracing/ftrace: add the printk-msg-only option
  tracing/ftrace: use preempt_enable_no_resched_notrace in ring_buffer_time_stamp()
  x86, bts: correctly report invalid bts records
  ...

Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits
being already partly merged by the SH merge.

2 files changed, 21 insertions, 15 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f763762d544a..f291f086caa1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -808,6 +808,7 @@ config TRACEPOINTS
 
 config MARKERS
         bool "Activate markers"
+        depends on TRACEPOINTS
         help
           Place an empty function call at each marker site. Can be
           dynamically changed for a probe function.
diff --git a/init/main.c b/init/main.c
index db843bff5732..17e9757bfde2 100644
--- 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>
@@ -704,31 +705,35 @@ core_param(initcall_debug, initcall_debug, bool, 0644);
 int do_one_initcall(initcall_t fn)
 {
         int count = preempt_count();
-        ktime_t delta;
+        ktime_t calltime, delta, rettime;
         char msgbuf[64];
-        struct boot_trace it;
+        struct boot_trace_call call;
+        struct boot_trace_ret ret;
 
         if (initcall_debug) {
-                it.caller = task_pid_nr(current);
-                printk("calling  %pF @ %i\n", fn, it.caller);
-                it.calltime = ktime_get();
+                call.caller = task_pid_nr(current);
+                printk("calling  %pF @ %i\n", fn, call.caller);
+                calltime = ktime_get();
+                trace_boot_call(&call, fn);
+                enable_boot_trace();
         }
 
-        it.result = fn();
+        ret.result = fn();
 
         if (initcall_debug) {
-                it.rettime = ktime_get();
-                delta = ktime_sub(it.rettime, it.calltime);
-                it.duration = (unsigned long long) delta.tv64 >> 10;
+                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,
-                        it.result, it.duration);
-                trace_boot(&it, fn);
+                        ret.result, ret.duration);
         }
 
         msgbuf[0] = 0;
 
-        if (it.result && it.result != -ENODEV && initcall_debug)
-                sprintf(msgbuf, "error code %d ", it.result);
+        if (ret.result && ret.result != -ENODEV && initcall_debug)
+                sprintf(msgbuf, "error code %d ", ret.result);
 
         if (preempt_count() != count) {
                 strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
@@ -742,7 +747,7 @@ int do_one_initcall(initcall_t fn)
                 printk("initcall %pF returned with %s\n", fn, msgbuf);
         }
 
-        return it.result;
+        return ret.result;
 }
 
 
@@ -883,7 +888,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;
 }