aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index f8b41bddc6dc..b1d255f04135 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1595,10 +1595,13 @@ asmlinkage int vprintk_emit(int facility, int level,
1595 * either merge it with the current buffer and flush, or if 1595 * either merge it with the current buffer and flush, or if
1596 * there was a race with interrupts (prefix == true) then just 1596 * there was a race with interrupts (prefix == true) then just
1597 * flush it out and store this line separately. 1597 * flush it out and store this line separately.
1598 * If the preceding printk was from a different task and missed
1599 * a newline, flush and append the newline.
1598 */ 1600 */
1599 if (cont.len && cont.owner == current) { 1601 if (cont.len) {
1600 if (!(lflags & LOG_PREFIX)) 1602 if (cont.owner == current && !(lflags & LOG_PREFIX))
1601 stored = cont_add(facility, level, text, text_len); 1603 stored = cont_add(facility, level, text,
1604 text_len);
1602 cont_flush(LOG_NEWLINE); 1605 cont_flush(LOG_NEWLINE);
1603 } 1606 }
1604 1607