diff options
| author | Ingo Molnar | 2008-07-10 11:43:00 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-10 11:43:00 +0200 |
| commit | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch) | |
| tree | 702dd6a7ce06d224d594c2293af546b11ac9f51b /kernel/printk.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | ftrace: prevent ftrace modifications while being kprobe'd, v2 (diff) | |
| download | kernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.gz kernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.xz kernel-qcow2-linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.zip | |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 2 |
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; |