Merge branch 'linus' into x86/urgent

[deliverable/linux.git] / kernel / trace / trace_sched_switch.c

diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 8f758d070c43777d96fb85515d3161c1eae1c63e..7e62c0a18456ebbad8fc66a83a9f2578a081e201 100644 (file)
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -247,51 +247,3 @@ void tracing_sched_switch_assign_trace(struct trace_array *tr)
        ctx_trace = tr;
 }
 
-static void stop_sched_trace(struct trace_array *tr)
-{
-       tracing_stop_sched_switch_record();
-}
-
-static int sched_switch_trace_init(struct trace_array *tr)
-{
-       ctx_trace = tr;
-       tracing_reset_online_cpus(tr);
-       tracing_start_sched_switch_record();
-       return 0;
-}
-
-static void sched_switch_trace_reset(struct trace_array *tr)
-{
-       if (sched_ref)
-               stop_sched_trace(tr);
-}
-
-static void sched_switch_trace_start(struct trace_array *tr)
-{
-       sched_stopped = 0;
-}
-
-static void sched_switch_trace_stop(struct trace_array *tr)
-{
-       sched_stopped = 1;
-}
-
-static struct tracer sched_switch_trace __read_mostly =
-{
-       .name           = "sched_switch",
-       .init           = sched_switch_trace_init,
-       .reset          = sched_switch_trace_reset,
-       .start          = sched_switch_trace_start,
-       .stop           = sched_switch_trace_stop,
-       .wait_pipe      = poll_wait_pipe,
-#ifdef CONFIG_FTRACE_SELFTEST
-       .selftest    = trace_selftest_startup_sched_switch,
-#endif
-};
-
-__init static int init_sched_switch_trace(void)
-{
-       return register_tracer(&sched_switch_trace);
-}
-device_initcall(init_sched_switch_trace);
-