Merge branch 'tracing/ftrace' into auto-ftrace-next

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index e2129e83fd75..75ef3af39132 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1041,7 +1041,9 @@ void release_console_sem(void)
                 _log_end = log_end;
                 con_start = log_end;            /* Flush */
                 spin_unlock(&logbuf_lock);
+                stop_critical_timings();        /* don't trace print latency */
                 call_console_drivers(_con_start, _log_end);
+                start_critical_timings();
                 local_irq_restore(flags);
         }
         console_locked = 0;