tracing: Replace the static global per_cpu arrays with allocated per_cpu

The global and max-tr currently use static per_cpu arrays for the CPU data
descriptors. But in order to get new allocated trace_arrays, they need to
be allocated per_cpu arrays. Instead of using the static arrays, switch
the global and max-tr to use allocated data.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 95e96842ed29..6dadbefbb1d6 100644
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -32,6 +32,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 {
         struct ftrace_event_call *call = &event_branch;
         struct trace_array *tr = branch_tracer;
+        struct trace_array_cpu *data;
         struct ring_buffer_event *event;
         struct trace_branch *entry;
         struct ring_buffer *buffer;
@@ -51,7 +52,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
 
         local_irq_save(flags);
         cpu = raw_smp_processor_id();
-        if (atomic_inc_return(&tr->data[cpu]->disabled) != 1)
+        data = per_cpu_ptr(tr->data, cpu);
+        if (atomic_inc_return(&data->disabled) != 1)
                 goto out;
 
         pc = preempt_count();
@@ -80,7 +82,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect)
                 __buffer_unlock_commit(buffer, event);
 
  out:
-        atomic_dec(&tr->data[cpu]->disabled);
+        atomic_dec(&data->disabled);
         local_irq_restore(flags);
 }