tracing: Make tracepoint_printk a static_key

[mirror_ubuntu-zesty-kernel.git] / kernel / trace / trace_events.c

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index ba67ede48822abce63b32a03099002bbbb93f4ff..d35fc2b0d3042c8222b4d5aed6ba47ddad9ee60c 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -283,46 +283,6 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
 }
 EXPORT_SYMBOL_GPL(trace_event_buffer_reserve);
 
-static DEFINE_SPINLOCK(tracepoint_iter_lock);
-
-static void output_printk(struct trace_event_buffer *fbuffer)
-{
-       struct trace_event_call *event_call;
-       struct trace_event *event;
-       unsigned long flags;
-       struct trace_iterator *iter = tracepoint_print_iter;
-
-       if (!iter)
-               return;
-
-       event_call = fbuffer->trace_file->event_call;
-       if (!event_call || !event_call->event.funcs ||
-           !event_call->event.funcs->trace)
-               return;
-
-       event = &fbuffer->trace_file->event_call->event;
-
-       spin_lock_irqsave(&tracepoint_iter_lock, flags);
-       trace_seq_init(&iter->seq);
-       iter->ent = fbuffer->entry;
-       event_call->event.funcs->trace(iter, 0, event);
-       trace_seq_putc(&iter->seq, 0);
-       printk("%s", iter->seq.buffer);
-
-       spin_unlock_irqrestore(&tracepoint_iter_lock, flags);
-}
-
-void trace_event_buffer_commit(struct trace_event_buffer *fbuffer)
-{
-       if (tracepoint_printk)
-               output_printk(fbuffer);
-
-       event_trigger_unlock_commit(fbuffer->trace_file, fbuffer->buffer,
-                                   fbuffer->event, fbuffer->entry,
-                                   fbuffer->flags, fbuffer->pc);
-}
-EXPORT_SYMBOL_GPL(trace_event_buffer_commit);
-
 int trace_event_reg(struct trace_event_call *call,
                    enum trace_reg type, void *data)
 {