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, 2 insertions, 2 deletions

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 601152523326..9d73861efc6a 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -76,7 +76,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip,
                 goto out;
 
         cpu = smp_processor_id();
-        data = tr->data[cpu];
+        data = per_cpu_ptr(tr->data, cpu);
         if (!atomic_read(&data->disabled)) {
                 local_save_flags(flags);
                 trace_function(tr, ip, parent_ip, flags, pc);
@@ -107,7 +107,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip,
          */
         local_irq_save(flags);
         cpu = raw_smp_processor_id();
-        data = tr->data[cpu];
+        data = per_cpu_ptr(tr->data, cpu);
         disabled = atomic_inc_return(&data->disabled);
 
         if (likely(disabled == 1)) {