1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ff1c4b20cd0a..51612b4a603f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1681,7 +1681,7 @@ void tracing_reset(struct trace_buffer *buf, int cpu)
         ring_buffer_record_disable(buffer);
 
         /* Make sure all commits have finished */
-        synchronize_sched();
+        synchronize_rcu();
         ring_buffer_reset_cpu(buffer, cpu);
 
         ring_buffer_record_enable(buffer);
@@ -1698,7 +1698,7 @@ void tracing_reset_online_cpus(struct trace_buffer *buf)
         ring_buffer_record_disable(buffer);
 
         /* Make sure all commits have finished */
-        synchronize_sched();
+        synchronize_rcu();
 
         buf->time_start = buffer_ftrace_now(buf, buf->cpu);
 
@@ -2250,7 +2250,7 @@ void trace_buffered_event_disable(void)
         preempt_enable();
 
         /* Wait for all current users to finish */
-        synchronize_sched();
+        synchronize_rcu();
 
         for_each_tracing_cpu(cpu) {
                 free_page((unsigned long)per_cpu(trace_buffered_event, cpu));
@@ -5398,7 +5398,7 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf)
         if (tr->current_trace->reset)
                 tr->current_trace->reset(tr);
 
-        /* Current trace needs to be nop_trace before synchronize_sched */
+        /* Current trace needs to be nop_trace before synchronize_rcu */
         tr->current_trace = &nop_trace;
 
 #ifdef CONFIG_TRACER_MAX_TRACE
@@ -5412,7 +5412,7 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf)
                  * The update_max_tr is called from interrupts disabled
                  * so a synchronized_sched() is sufficient.
                  */
-                synchronize_sched();
+                synchronize_rcu();
                 free_snapshot(tr);
         }
 #endif