tracing: Remove one use of trace_current_buffer_lock_reserve()

The only user of trace_current_buffer_lock_reserve() is in the boot up self
tests. Restructure the code a little to have that code use what everything
else uses: trace_event_buffer_lock_reserve().

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 10 insertions, 8 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index e7cb983ee93c..da1eeb6190e3 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3392,7 +3392,7 @@ static __init void event_trace_self_tests(void)
 
 static DEFINE_PER_CPU(atomic_t, ftrace_test_event_disable);
 
-static struct trace_array *event_tr;
+static struct trace_event_file event_trace_file __initdata;
 
 static void __init
 function_test_events_call(unsigned long ip, unsigned long parent_ip,
@@ -3416,17 +3416,17 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip,
 
         local_save_flags(flags);
 
-        event = trace_current_buffer_lock_reserve(&buffer,
-                                                  TRACE_FN, sizeof(*entry),
-                                                  flags, pc);
+        event = trace_event_buffer_lock_reserve(&buffer, &event_trace_file,
+                                                TRACE_FN, sizeof(*entry),
+                                                flags, pc);
         if (!event)
                 goto out;
         entry   = ring_buffer_event_data(event);
         entry->ip                       = ip;
         entry->parent_ip                = parent_ip;
 
-        trace_buffer_unlock_commit(event_tr, buffer, event, flags, pc);
-
+        event_trigger_unlock_commit(&event_trace_file, buffer, event,
+                                    entry, flags, pc);
  out:
         atomic_dec(&per_cpu(ftrace_test_event_disable, cpu));
         preempt_enable_notrace();
@@ -3441,9 +3441,11 @@ static struct ftrace_ops trace_ops __initdata  =
 static __init void event_trace_self_test_with_function(void)
 {
         int ret;
-        event_tr = top_trace_array();
-        if (WARN_ON(!event_tr))
+
+        event_trace_file.tr = top_trace_array();
+        if (WARN_ON(!event_trace_file.tr))
                 return;
+
         ret = register_ftrace_function(&trace_ops);
         if (WARN_ON(ret < 0)) {
                 pr_info("Failed to enable function tracer for event tests\n");