diff options
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 823687997b01..176debd3481b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8288,6 +8288,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); @@ -8367,7 +8368,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);  |