1 files changed, 16 insertions, 28 deletions

diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 713a2cac488..667aa8cc0cf 100644
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -7,7 +7,7 @@
  * From code in the latency_tracer, that is:
  *
  *  Copyright (C) 2004-2006 Ingo Molnar
- *  Copyright (C) 2004 Nadia Yvette Chambers
+ *  Copyright (C) 2004 William Lee Irwin III
  */
 #include <linux/kallsyms.h>
 #include <linux/debugfs.h>
@@ -23,7 +23,7 @@ static int				tracer_enabled __read_mostly;
 
 static DEFINE_PER_CPU(int, tracing_cpu);
 
-static DEFINE_RAW_SPINLOCK(max_trace_lock);
+static DEFINE_SPINLOCK(max_trace_lock);
 
 enum {
         TRACER_IRQS_OFF         = (1 << 1),
@@ -136,8 +136,7 @@ static int func_prolog_dec(struct trace_array *tr,
  * irqsoff uses its own tracer function to keep the overhead down:
  */
 static void
-irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip,
-                    struct ftrace_ops *op, struct pt_regs *pt_regs)
+irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip)
 {
         struct trace_array *tr = irqsoff_trace;
         struct trace_array_cpu *data;
@@ -154,7 +153,7 @@ irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip,
 static struct ftrace_ops trace_ops __read_mostly =
 {
         .func = irqsoff_tracer_call,
-        .flags = FTRACE_OPS_FL_GLOBAL | FTRACE_OPS_FL_RECURSION_SAFE,
+        .flags = FTRACE_OPS_FL_GLOBAL,
 };
 #endif /* CONFIG_FUNCTION_TRACER */
 
@@ -281,20 +280,9 @@ static enum print_line_t irqsoff_print_line(struct trace_iterator *iter)
 }
 
 static void irqsoff_graph_return(struct ftrace_graph_ret *trace) { }
+static void irqsoff_print_header(struct seq_file *s) { }
 static void irqsoff_trace_open(struct trace_iterator *iter) { }
 static void irqsoff_trace_close(struct trace_iterator *iter) { }
-
-#ifdef CONFIG_FUNCTION_TRACER
-static void irqsoff_print_header(struct seq_file *s)
-{
-        trace_default_header(s);
-}
-#else
-static void irqsoff_print_header(struct seq_file *s)
-{
-        trace_latency_header(s);
-}
-#endif /* CONFIG_FUNCTION_TRACER */
 #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
 /*
@@ -333,7 +321,7 @@ check_critical_timing(struct trace_array *tr,
         if (!report_latency(delta))
                 goto out;
 
-        raw_spin_lock_irqsave(&max_trace_lock, flags);
+        spin_lock_irqsave(&max_trace_lock, flags);
 
         /* check if we are still the max latency */
         if (!report_latency(delta))
@@ -356,7 +344,7 @@ check_critical_timing(struct trace_array *tr,
         max_sequence++;
 
 out_unlock:
-        raw_spin_unlock_irqrestore(&max_trace_lock, flags);
+        spin_unlock_irqrestore(&max_trace_lock, flags);
 
 out:
         data->critical_sequence = max_sequence;
@@ -517,13 +505,13 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
 #ifdef CONFIG_PREEMPT_TRACER
 void trace_preempt_on(unsigned long a0, unsigned long a1)
 {
-        if (preempt_trace() && !irq_trace())
+        if (preempt_trace())
                 stop_critical_timing(a0, a1);
 }
 
 void trace_preempt_off(unsigned long a0, unsigned long a1)
 {
-        if (preempt_trace() && !irq_trace())
+        if (preempt_trace())
                 start_critical_timing(a0, a1);
 }
 #endif /* CONFIG_PREEMPT_TRACER */
@@ -604,7 +592,7 @@ static struct tracer irqsoff_tracer __read_mostly =
         .reset          = irqsoff_tracer_reset,
         .start          = irqsoff_tracer_start,
         .stop           = irqsoff_tracer_stop,
-        .print_max      = true,
+        .print_max      = 1,
         .print_header   = irqsoff_print_header,
         .print_line     = irqsoff_print_line,
         .flags          = &tracer_flags,
@@ -614,7 +602,7 @@ static struct tracer irqsoff_tracer __read_mostly =
 #endif
         .open           = irqsoff_trace_open,
         .close          = irqsoff_trace_close,
-        .use_max_tr     = true,
+        .use_max_tr     = 1,
 };
 # define register_irqsoff(trace) register_tracer(&trace)
 #else
@@ -637,7 +625,7 @@ static struct tracer preemptoff_tracer __read_mostly =
         .reset          = irqsoff_tracer_reset,
         .start          = irqsoff_tracer_start,
         .stop           = irqsoff_tracer_stop,
-        .print_max      = true,
+        .print_max      = 1,
         .print_header   = irqsoff_print_header,
         .print_line     = irqsoff_print_line,
         .flags          = &tracer_flags,
@@ -647,7 +635,7 @@ static struct tracer preemptoff_tracer __read_mostly =
 #endif
         .open           = irqsoff_trace_open,
         .close          = irqsoff_trace_close,
-        .use_max_tr     = true,
+        .use_max_tr     = 1,
 };
 # define register_preemptoff(trace) register_tracer(&trace)
 #else
@@ -672,7 +660,7 @@ static struct tracer preemptirqsoff_tracer __read_mostly =
         .reset          = irqsoff_tracer_reset,
         .start          = irqsoff_tracer_start,
         .stop           = irqsoff_tracer_stop,
-        .print_max      = true,
+        .print_max      = 1,
         .print_header   = irqsoff_print_header,
         .print_line     = irqsoff_print_line,
         .flags          = &tracer_flags,
@@ -682,7 +670,7 @@ static struct tracer preemptirqsoff_tracer __read_mostly =
 #endif
         .open           = irqsoff_trace_open,
         .close          = irqsoff_trace_close,
-        .use_max_tr     = true,
+        .use_max_tr     = 1,
 };
 
 # define register_preemptirqsoff(trace) register_tracer(&trace)
@@ -698,4 +686,4 @@ __init static int init_irqsoff_tracer(void)
 
         return 0;
 }
-core_initcall(init_irqsoff_tracer);
+device_initcall(init_irqsoff_tracer);