3 files changed, 24 insertions, 6 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index e6fac0ffe6f0..6bad12819eb6 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -860,15 +860,25 @@ static void ftrace_trace_stack(struct trace_array *tr,
 static void ftrace_trace_userstack(struct trace_array *tr,
                                    unsigned long flags, int pc);
 
-void trace_buffer_unlock_commit(struct trace_array *tr,
-                                struct ring_buffer_event *event,
-                                unsigned long flags, int pc)
+static inline void __trace_buffer_unlock_commit(struct trace_array *tr,
+                                        struct ring_buffer_event *event,
+                                        unsigned long flags, int pc,
+                                        int wake)
 {
         ring_buffer_unlock_commit(tr->buffer, event);
 
         ftrace_trace_stack(tr, flags, 6, pc);
         ftrace_trace_userstack(tr, flags, pc);
-        trace_wake_up();
+
+        if (wake)
+                trace_wake_up();
+}
+
+void trace_buffer_unlock_commit(struct trace_array *tr,
+                                        struct ring_buffer_event *event,
+                                        unsigned long flags, int pc)
+{
+        __trace_buffer_unlock_commit(tr, event, flags, pc, 1);
 }
 
 struct ring_buffer_event *
@@ -882,7 +892,13 @@ trace_current_buffer_lock_reserve(unsigned char type, unsigned long len,
 void trace_current_buffer_unlock_commit(struct ring_buffer_event *event,
                                         unsigned long flags, int pc)
 {
-        return trace_buffer_unlock_commit(&global_trace, event, flags, pc);
+        return __trace_buffer_unlock_commit(&global_trace, event, flags, pc, 1);
+}
+
+void trace_nowake_buffer_unlock_commit(struct ring_buffer_event *event,
+                                        unsigned long flags, int pc)
+{
+        return __trace_buffer_unlock_commit(&global_trace, event, flags, pc, 0);
 }
 
 void
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f267723c3c52..54fd9bcd0a65 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -483,6 +483,8 @@ trace_current_buffer_lock_reserve(unsigned char type, unsigned long len,
                                   unsigned long flags, int pc);
 void trace_current_buffer_unlock_commit(struct ring_buffer_event *event,
                                         unsigned long flags, int pc);
+void trace_nowake_buffer_unlock_commit(struct ring_buffer_event *event,
+                                        unsigned long flags, int pc);
 
 struct trace_entry *tracing_get_trace_entry(struct trace_array *tr,
                                                 struct trace_array_cpu *data);
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index ebf215e87d5e..9a3bd49b52e5 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -222,7 +222,7 @@ static void ftrace_raw_event_##call(proto)				\
                                                                         \
         assign;                                                         \
                                                                         \
-        trace_current_buffer_unlock_commit(event, irq_flags, pc);       \
+        trace_nowake_buffer_unlock_commit(event, irq_flags, pc);        \
                                                                         \
         if (call->preds && !filter_match_preds(call, entry))            \
                 ring_buffer_event_discard(event);                       \