|
@@ -262,12 +262,6 @@ out:
|
|
atomic_dec(&wakeup_trace->data[cpu]->disabled);
|
|
atomic_dec(&wakeup_trace->data[cpu]->disabled);
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * save_tracer_enabled is used to save the state of the tracer_enabled
|
|
|
|
- * variable when we disable it when we open a trace output file.
|
|
|
|
- */
|
|
|
|
-static int save_tracer_enabled;
|
|
|
|
-
|
|
|
|
static void start_wakeup_tracer(struct trace_array *tr)
|
|
static void start_wakeup_tracer(struct trace_array *tr)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
@@ -306,13 +300,10 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
|
|
|
|
|
register_ftrace_function(&trace_ops);
|
|
register_ftrace_function(&trace_ops);
|
|
|
|
|
|
- if (tracing_is_enabled()) {
|
|
|
|
|
|
+ if (tracing_is_enabled())
|
|
tracer_enabled = 1;
|
|
tracer_enabled = 1;
|
|
- save_tracer_enabled = 1;
|
|
|
|
- } else {
|
|
|
|
|
|
+ else
|
|
tracer_enabled = 0;
|
|
tracer_enabled = 0;
|
|
- save_tracer_enabled = 0;
|
|
|
|
- }
|
|
|
|
|
|
|
|
return;
|
|
return;
|
|
fail_deprobe_wake_new:
|
|
fail_deprobe_wake_new:
|
|
@@ -324,7 +315,6 @@ fail_deprobe:
|
|
static void stop_wakeup_tracer(struct trace_array *tr)
|
|
static void stop_wakeup_tracer(struct trace_array *tr)
|
|
{
|
|
{
|
|
tracer_enabled = 0;
|
|
tracer_enabled = 0;
|
|
- save_tracer_enabled = 0;
|
|
|
|
unregister_ftrace_function(&trace_ops);
|
|
unregister_ftrace_function(&trace_ops);
|
|
unregister_trace_sched_switch(probe_wakeup_sched_switch);
|
|
unregister_trace_sched_switch(probe_wakeup_sched_switch);
|
|
unregister_trace_sched_wakeup_new(probe_wakeup);
|
|
unregister_trace_sched_wakeup_new(probe_wakeup);
|
|
@@ -350,28 +340,11 @@ static void wakeup_tracer_start(struct trace_array *tr)
|
|
{
|
|
{
|
|
wakeup_reset(tr);
|
|
wakeup_reset(tr);
|
|
tracer_enabled = 1;
|
|
tracer_enabled = 1;
|
|
- save_tracer_enabled = 1;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static void wakeup_tracer_stop(struct trace_array *tr)
|
|
static void wakeup_tracer_stop(struct trace_array *tr)
|
|
{
|
|
{
|
|
tracer_enabled = 0;
|
|
tracer_enabled = 0;
|
|
- save_tracer_enabled = 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static void wakeup_tracer_open(struct trace_iterator *iter)
|
|
|
|
-{
|
|
|
|
- /* stop the trace while dumping */
|
|
|
|
- tracer_enabled = 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static void wakeup_tracer_close(struct trace_iterator *iter)
|
|
|
|
-{
|
|
|
|
- /* forget about any processes we were recording */
|
|
|
|
- if (save_tracer_enabled) {
|
|
|
|
- wakeup_reset(iter->tr);
|
|
|
|
- tracer_enabled = 1;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static struct tracer wakeup_tracer __read_mostly =
|
|
static struct tracer wakeup_tracer __read_mostly =
|
|
@@ -381,8 +354,6 @@ static struct tracer wakeup_tracer __read_mostly =
|
|
.reset = wakeup_tracer_reset,
|
|
.reset = wakeup_tracer_reset,
|
|
.start = wakeup_tracer_start,
|
|
.start = wakeup_tracer_start,
|
|
.stop = wakeup_tracer_stop,
|
|
.stop = wakeup_tracer_stop,
|
|
- .open = wakeup_tracer_open,
|
|
|
|
- .close = wakeup_tracer_close,
|
|
|
|
.print_max = 1,
|
|
.print_max = 1,
|
|
#ifdef CONFIG_FTRACE_SELFTEST
|
|
#ifdef CONFIG_FTRACE_SELFTEST
|
|
.selftest = trace_selftest_startup_wakeup,
|
|
.selftest = trace_selftest_startup_wakeup,
|