Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

Pull ftrace fixlets from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined kernel/trace/trace.c
index 5c38c81,d1a8d07..08acf42
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -426,15 -426,15 +426,15 @@@ __setup("trace_buf_size=", set_buf_size
  
  static int __init set_tracing_thresh(char *str)
  {
-       unsigned long threshhold;
+       unsigned long threshold;
        int ret;
  
        if (!str)
                return 0;
-       ret = strict_strtoul(str, 0, &threshhold);
+       ret = strict_strtoul(str, 0, &threshold);
        if (ret < 0)
                return 0;
-       tracing_thresh = threshhold * 1000;
+       tracing_thresh = threshold * 1000;
        return 1;
  }
  __setup("tracing_thresh=", set_tracing_thresh);
@@@ -3187,10 -3187,10 +3187,10 @@@ static int tracing_set_tracer(const cha
        }
        destroy_trace_option_files(topts);
  
 -      current_trace = t;
 +      current_trace = &nop_trace;
  
 -      topts = create_trace_option_files(current_trace);
 -      if (current_trace->use_max_tr) {
 +      topts = create_trace_option_files(t);
 +      if (t->use_max_tr) {
                int cpu;
                /* we need to make per cpu buffer sizes equivalent */
                for_each_tracing_cpu(cpu) {
@@@ -3210,7 -3210,6 +3210,7 @@@
                        goto out;
        }
  
 +      current_trace = t;
        trace_branch_enable(tr);
   out:
        mutex_unlock(&trace_types_lock);