ftrace: CPU buffer start annotation clean ups

[safe/jmp/linux-2.6] / kernel / trace / trace_irqsoff.c

diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 3509086..d919d4e 100644 (file)
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -383,23 +383,12 @@ static void __irqsoff_tracer_init(struct trace_array *tr)
        irqsoff_trace = tr;
        /* make sure that the tracer is visible */
        smp_wmb();
-
-       if (tr->ctrl)
-               start_irqsoff_tracer(tr);
+       start_irqsoff_tracer(tr);
 }
 
 static void irqsoff_tracer_reset(struct trace_array *tr)
 {
-       if (tr->ctrl)
-               stop_irqsoff_tracer(tr);
-}
-
-static void irqsoff_tracer_ctrl_update(struct trace_array *tr)
-{
-       if (tr->ctrl)
-               start_irqsoff_tracer(tr);
-       else
-               stop_irqsoff_tracer(tr);
+       stop_irqsoff_tracer(tr);
 }
 
 static void irqsoff_tracer_start(struct trace_array *tr)
@@ -442,7 +431,6 @@ static struct tracer irqsoff_tracer __read_mostly =
        .stop           = irqsoff_tracer_stop,
        .open           = irqsoff_tracer_open,
        .close          = irqsoff_tracer_close,
-       .ctrl_update    = irqsoff_tracer_ctrl_update,
        .print_max      = 1,
 #ifdef CONFIG_FTRACE_SELFTEST
        .selftest    = trace_selftest_startup_irqsoff,
@@ -470,7 +458,6 @@ static struct tracer preemptoff_tracer __read_mostly =
        .stop           = irqsoff_tracer_stop,
        .open           = irqsoff_tracer_open,
        .close          = irqsoff_tracer_close,
-       .ctrl_update    = irqsoff_tracer_ctrl_update,
        .print_max      = 1,
 #ifdef CONFIG_FTRACE_SELFTEST
        .selftest    = trace_selftest_startup_preemptoff,
@@ -500,7 +487,6 @@ static struct tracer preemptirqsoff_tracer __read_mostly =
        .stop           = irqsoff_tracer_stop,
        .open           = irqsoff_tracer_open,
        .close          = irqsoff_tracer_close,
-       .ctrl_update    = irqsoff_tracer_ctrl_update,
        .print_max      = 1,
 #ifdef CONFIG_FTRACE_SELFTEST
        .selftest    = trace_selftest_startup_preemptirqsoff,