1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index bcd93031d042..f106ad12f72f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8265,6 +8265,7 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
         tracing_off();
 
         local_irq_save(flags);
+        printk_nmi_direct_enter();
 
         /* Simulate the iterator */
         trace_init_global_iter(&iter);
@@ -8344,7 +8345,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
         for_each_tracing_cpu(cpu) {
                 atomic_dec(&per_cpu_ptr(iter.trace_buffer->data, cpu)->disabled);
         }
-        atomic_dec(&dump_running);
+        atomic_dec(&dump_running);
+        printk_nmi_direct_exit();
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL_GPL(ftrace_dump);