diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-08-30 16:36:10 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-08-30 16:36:10 +0200 |
| commit | c985aafb60e972c0a6b8d0bd65e03af5890b748a (patch) | |
| tree | fb75c6e5330663eeaff707dee672762e607e2f0b /kernel/trace | |
| parent | 715d3edb79c6c2b68dedf348b0aa96e61f360292 (diff) | |
| parent | 26d1982fd17c2cac77f9cf764255362ccb28fe49 (diff) | |
| download | linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.gz linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.tar.bz2 linux-c985aafb60e972c0a6b8d0bd65e03af5890b748a.zip | |
Merge branch 'rework/printk_safe-removal' into for-linus
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f8b80b5bab71..da057c13f9fe 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9797,7 +9797,6 @@ 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); @@ -9879,7 +9878,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) atomic_dec(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled); } atomic_dec(&dump_running); - printk_nmi_direct_exit(); local_irq_restore(flags); } EXPORT_SYMBOL_GPL(ftrace_dump); |