Subject: [merged] printk-flush-conflicting-continuation-line.patch removed from -mm tree
To: arunks.linux@xxxxxxxxx,arun.ks@xxxxxxxxxxxx,fweisbec@xxxxxxxxx,getarunks@xxxxxxxxx,joe@xxxxxxxxxxx,kay@xxxxxxxx,paul.gortmaker@xxxxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:00:59 -0800
The patch titled
Subject: printk: flush conflicting continuation line
has been removed from the -mm tree. Its filename was
printk-flush-conflicting-continuation-line.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Arun KS <arunks.linux@xxxxxxxxx>
Subject: printk: flush conflicting continuation line
An earlier newline was missing and current print is from different task.
In this scenario flush the continuation line and store this line
seperatly.
This patch fix the below scenario of timestamp interleaving,
<6>[ 28.154370 ] read_word_reg : reg[0x 3], reg[0x 4] data [0x 642]
<6>[ 28.155428 ] uart disconnect
<6>[ 31.947341 ] dvfs[cpufreq.c<275>]:plug-in cpu<1> done
<4>[ 28.155445 ] UART detached : send switch state 201
<6>[ 32.014112 ] read_reg : reg[0x 3] data[0x21]
[akpm@xxxxxxxxxxxxxxxxxxxx: simplify and condense the code]
Signed-off-by: Arun KS <getarunks@xxxxxxxxx>
Signed-off-by: Arun KS <arun.ks@xxxxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Cc: Kay Sievers <kay@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/printk.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN kernel/printk/printk.c~printk-flush-conflicting-continuation-line kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-flush-conflicting-continuation-line
+++ a/kernel/printk/printk.c
@@ -1595,10 +1595,13 @@ asmlinkage int vprintk_emit(int facility
* either merge it with the current buffer and flush, or if
* there was a race with interrupts (prefix == true) then just
* flush it out and store this line separately.
+ * If the preceding printk was from a different task and missed
+ * a newline, flush and append the newline.
*/
- if (cont.len && cont.owner == current) {
- if (!(lflags & LOG_PREFIX))
- stored = cont_add(facility, level, text, text_len);
+ if (cont.len) {
+ if (cont.owner == current && !(lflags & LOG_PREFIX))
+ stored = cont_add(facility, level, text,
+ text_len);
cont_flush(LOG_NEWLINE);
}
_
Patches currently in -mm which might be from arunks.linux@xxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
