The patch titled
Subject: printk: git rid of [sched_delayed] message for printk_deferred
has been added to the -mm tree. Its filename is
printk-git-rid-of-message-for-printk_deferred.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/printk-git-rid-of-message-for-printk_deferred.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/printk-git-rid-of-message-for-printk_deferred.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
Subject: printk: git rid of [sched_delayed] message for printk_deferred
Commit 458df9fd ("printk: remove separate printk_sched buffers and use
printk buf instead") hardcodes printk_deferred() to KERN_WARNING and
inserts the string "[sched_delayed] " before the actual message. However
it doesn't take into account the KERN_* prefix of the message, that now
ends up in the middle of the output:
[sched_delayed] ^a4CE: hpet increased min_delta_ns to 20115 nsec
Fix this by just getting rid of the "[sched_delayed] " scnprintf(). The
prefix is useless since 458df9fd4815 anyway since from that moment
printk_deferred() inserts the message into the kernel printk buffer
immediately. So if the message eventually gets printed to console, it is
printed in the correct order with other messages and there's no need for
any special prefix. And if the kernel crashes before the message makes it
to console, then prefix in the printk buffer doesn't make the situation
any better.
Link: http://lkml.org/lkml/2014/9/14/4
Signed-off-by: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
Acked-by: Jan Kara <jack@xxxxxxx>
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/printk/printk.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff -puN kernel/printk/printk.c~printk-git-rid-of-message-for-printk_deferred kernel/printk/printk.c
--- a/kernel/printk/printk.c~printk-git-rid-of-message-for-printk_deferred
+++ a/kernel/printk/printk.c
@@ -1685,12 +1685,7 @@ asmlinkage int vprintk_emit(int facility
* The printf needs to come first; we need the syslog
* prefix which might be passed-in as a parameter.
*/
- if (in_sched)
- text_len = scnprintf(text, sizeof(textbuf),
- KERN_WARNING "[sched_delayed] ");
-
- text_len += vscnprintf(text + text_len,
- sizeof(textbuf) - text_len, fmt, args);
+ text_len = vscnprintf(text, sizeof(textbuf), fmt, args);
/* mark and strip a trailing newline */
if (text_len && text[text_len-1] == '\n') {
_
Patches currently in -mm which might be from markus@xxxxxxxxxxxxxxx are
printk-git-rid-of-message-for-printk_deferred.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
