Merge tag 'trace-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[linux-2.6-microblaze.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 27febd4..d300527 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3105,17 +3105,17 @@ void __trace_stack(struct trace_array *tr, unsigned int trace_ctx,
        }
 
        /*
-        * When an NMI triggers, RCU is enabled via rcu_nmi_enter(),
+        * When an NMI triggers, RCU is enabled via ct_nmi_enter(),
         * but if the above rcu_is_watching() failed, then the NMI
-        * triggered someplace critical, and rcu_irq_enter() should
+        * triggered someplace critical, and ct_irq_enter() should
         * not be called from NMI.
         */
        if (unlikely(in_nmi()))
                return;
 
-       rcu_irq_enter_irqson();
+       ct_irq_enter_irqson();
        __ftrace_trace_stack(buffer, trace_ctx, skip, NULL);
-       rcu_irq_exit_irqson();
+       ct_irq_exit_irqson();
 }
 
 /**