aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/trace_boot.c4
-rw-r--r--kernel/trace/trace_sched_switch.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 6bbc8794a6df..bd5046c9deb7 100644
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -37,9 +37,9 @@ void disable_boot_trace(void)
37 tracing_stop_cmdline_record(); 37 tracing_stop_cmdline_record();
38} 38}
39 39
40void reset_boot_trace(struct trace_array *tr) 40static void reset_boot_trace(struct trace_array *tr)
41{ 41{
42 disable_boot_trace(); 42 sched_switch_trace.reset(tr);
43} 43}
44 44
45static void boot_trace_init(struct trace_array *tr) 45static void boot_trace_init(struct trace_array *tr)
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 969953bf678f..888944d3409d 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -173,7 +173,7 @@ static void sched_switch_trace_init(struct trace_array *tr)
173 173
174static void sched_switch_trace_reset(struct trace_array *tr) 174static void sched_switch_trace_reset(struct trace_array *tr)
175{ 175{
176 if (tr->ctrl) 176 if (tr->ctrl && sched_ref)
177 stop_sched_trace(tr); 177 stop_sched_trace(tr);
178} 178}
179 179