tracing: Make tracing_enabled be equal to tracing_on

The tracing_enabled file has been deprecated as it never was able
to serve its purpose well. The tracing_on file has taken over.
Instead of having code to keep tracing_enabled, have the tracing_enabled
file just set tracing_on, and remove the tracing_enabled variable.

This allows us to remove the tracing_enabled file. The reason that
the remove is in a different change set and not removed here is
in case we find some lonely userspace tool that requires the file
to exist. Then the removal patch will get reverted, but this one
will not.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 0 insertions, 12 deletions

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 2c00a691a540..091b815f7b0a 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -320,7 +320,6 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
                                            int (*func)(void))
 {
         int save_ftrace_enabled = ftrace_enabled;
-        int save_tracer_enabled = tracer_enabled;
         unsigned long count;
         char *func_name;
         int ret;
@@ -331,7 +330,6 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
 
         /* enable tracing, and record the filter function */
         ftrace_enabled = 1;
-        tracer_enabled = 1;
 
         /* passed in by parameter to fool gcc from optimizing */
         func();
@@ -395,7 +393,6 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
 
  out:
         ftrace_enabled = save_ftrace_enabled;
-        tracer_enabled = save_tracer_enabled;
 
         /* Enable tracing on all functions again */
         ftrace_set_global_filter(NULL, 0, 1);
@@ -452,7 +449,6 @@ static int
 trace_selftest_function_recursion(void)
 {
         int save_ftrace_enabled = ftrace_enabled;
-        int save_tracer_enabled = tracer_enabled;
         char *func_name;
         int len;
         int ret;
@@ -465,7 +461,6 @@ trace_selftest_function_recursion(void)
 
         /* enable tracing, and record the filter function */
         ftrace_enabled = 1;
-        tracer_enabled = 1;
 
         /* Handle PPC64 '.' name */
         func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
@@ -534,7 +529,6 @@ trace_selftest_function_recursion(void)
         ret = 0;
 out:
         ftrace_enabled = save_ftrace_enabled;
-        tracer_enabled = save_tracer_enabled;
 
         return ret;
 }
@@ -569,7 +563,6 @@ static int
 trace_selftest_function_regs(void)
 {
         int save_ftrace_enabled = ftrace_enabled;
-        int save_tracer_enabled = tracer_enabled;
         char *func_name;
         int len;
         int ret;
@@ -586,7 +579,6 @@ trace_selftest_function_regs(void)
 
         /* enable tracing, and record the filter function */
         ftrace_enabled = 1;
-        tracer_enabled = 1;
 
         /* Handle PPC64 '.' name */
         func_name = "*" __stringify(DYN_FTRACE_TEST_NAME);
@@ -648,7 +640,6 @@ trace_selftest_function_regs(void)
         ret = 0;
 out:
         ftrace_enabled = save_ftrace_enabled;
-        tracer_enabled = save_tracer_enabled;
 
         return ret;
 }
@@ -662,7 +653,6 @@ int
 trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
 {
         int save_ftrace_enabled = ftrace_enabled;
-        int save_tracer_enabled = tracer_enabled;
         unsigned long count;
         int ret;
 
@@ -671,7 +661,6 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
 
         /* start the tracing */
         ftrace_enabled = 1;
-        tracer_enabled = 1;
 
         ret = tracer_init(trace, tr);
         if (ret) {
@@ -708,7 +697,6 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
         ret = trace_selftest_function_regs();
  out:
         ftrace_enabled = save_ftrace_enabled;
-        tracer_enabled = save_tracer_enabled;
 
         /* kill ftrace totally if we failed */
         if (ret)