1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
index 9b52f9cf7a0d..5aa40ab72b57 100644
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
@@ -121,7 +121,7 @@ static int func_prolog_dec(struct trace_array *tr,
         if (!irqs_disabled_flags(*flags))
                 return 0;
 
-        *data = per_cpu_ptr(tr->data, cpu);
+        *data = per_cpu_ptr(tr->trace_buffer.data, cpu);
         disabled = atomic_inc_return(&(*data)->disabled);
 
         if (likely(disabled == 1))
@@ -175,7 +175,7 @@ static int irqsoff_set_flag(u32 old_flags, u32 bit, int set)
                 per_cpu(tracing_cpu, cpu) = 0;
 
         tracing_max_latency = 0;
-        tracing_reset_online_cpus(irqsoff_trace);
+        tracing_reset_online_cpus(&irqsoff_trace->trace_buffer);
 
         return start_irqsoff_tracer(irqsoff_trace, set);
 }
@@ -380,7 +380,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip)
         if (per_cpu(tracing_cpu, cpu))
                 return;
 
-        data = per_cpu_ptr(tr->data, cpu);
+        data = per_cpu_ptr(tr->trace_buffer.data, cpu);
 
         if (unlikely(!data) || atomic_read(&data->disabled))
                 return;
@@ -418,7 +418,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip)
         if (!tracer_enabled)
                 return;
 
-        data = per_cpu_ptr(tr->data, cpu);
+        data = per_cpu_ptr(tr->trace_buffer.data, cpu);
 
         if (unlikely(!data) ||
             !data->critical_start || atomic_read(&data->disabled))
@@ -568,7 +568,7 @@ static void __irqsoff_tracer_init(struct trace_array *tr)
         irqsoff_trace = tr;
         /* make sure that the tracer is visible */
         smp_wmb();
-        tracing_reset_online_cpus(tr);
+        tracing_reset_online_cpus(&tr->trace_buffer);
 
         if (start_irqsoff_tracer(tr, is_graph()))
                 printk(KERN_ERR "failed to start irqsoff tracer\n");