Merge commit 'origin/master' into next

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

diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 79410db..df175cb 100644 (file)
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -49,7 +49,7 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev,
 }
 
 static void
-probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee)
+probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee, int success)
 {
        struct trace_array_cpu *data;
        unsigned long flags;
@@ -72,16 +72,6 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee)
        local_irq_restore(flags);
 }
 
-static void sched_switch_reset(struct trace_array *tr)
-{
-       int cpu;
-
-       tr->time_start = ftrace_now(tr->cpu);
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-}
-
 static int tracing_sched_register(void)
 {
        int ret;
@@ -197,7 +187,7 @@ void tracing_sched_switch_assign_trace(struct trace_array *tr)
 
 static void start_sched_trace(struct trace_array *tr)
 {
-       sched_switch_reset(tr);
+       tracing_reset_online_cpus(tr);
        tracing_start_sched_switch_record();
 }
 
@@ -206,32 +196,22 @@ static void stop_sched_trace(struct trace_array *tr)
        tracing_stop_sched_switch_record();
 }
 
-static void sched_switch_trace_init(struct trace_array *tr)
+static int sched_switch_trace_init(struct trace_array *tr)
 {
        ctx_trace = tr;
-
-       if (tr->ctrl)
-               start_sched_trace(tr);
+       start_sched_trace(tr);
+       return 0;
 }
 
 static void sched_switch_trace_reset(struct trace_array *tr)
 {
-       if (tr->ctrl && sched_ref)
-               stop_sched_trace(tr);
-}
-
-static void sched_switch_trace_ctrl_update(struct trace_array *tr)
-{
-       /* When starting a new trace, reset the buffers */
-       if (tr->ctrl)
-               start_sched_trace(tr);
-       else
+       if (sched_ref)
                stop_sched_trace(tr);
 }
 
 static void sched_switch_trace_start(struct trace_array *tr)
 {
-       sched_switch_reset(tr);
+       tracing_reset_online_cpus(tr);
        tracing_start_sched_switch();
 }
 
@@ -247,7 +227,6 @@ static struct tracer sched_switch_trace __read_mostly =
        .reset          = sched_switch_trace_reset,
        .start          = sched_switch_trace_start,
        .stop           = sched_switch_trace_stop,
-       .ctrl_update    = sched_switch_trace_ctrl_update,
 #ifdef CONFIG_FTRACE_SELFTEST
        .selftest    = trace_selftest_startup_sched_switch,
 #endif
@@ -258,3 +237,4 @@ __init static int init_sched_switch_trace(void)
        return register_tracer(&sched_switch_trace);
 }
 device_initcall(init_sched_switch_trace);
+