From: Markus Trippelsdorf <markus@trippelsdorf.de>
To: Jan Kara <jack@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] printk: git rid of [sched_delayed] message for printk_deferred
Date: Tue, 16 Sep 2014 16:42:52 +0200 [thread overview]
Message-ID: <20140916144252.GB32118@x4> (raw)
In-Reply-To: <20140916105547.GA1205@quack.suse.cz>
commit 458df9fd 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().
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 1ce770687ea8..f85994b58934 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1680,12 +1680,7 @@ asmlinkage int vprintk_emit(int facility, int level,
* 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') {
--
Markus
next prev parent reply other threads:[~2014-09-16 14:42 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-14 5:09 Weird character in kernel message Markus Trippelsdorf
2014-09-14 5:54 ` Markus Trippelsdorf
2014-09-14 9:13 ` Geert Uytterhoeven
2014-09-15 16:37 ` Markus Trippelsdorf
2014-09-16 10:55 ` Jan Kara
2014-09-16 14:42 ` Markus Trippelsdorf [this message]
2014-09-16 15:13 ` [PATCH] printk: git rid of [sched_delayed] message for printk_deferred Steven Rostedt
2014-09-16 15:20 ` Markus Trippelsdorf
2014-09-16 19:14 ` Steven Rostedt
2014-09-16 19:17 ` Markus Trippelsdorf
2014-09-16 20:26 ` Steven Rostedt
2014-09-16 20:35 ` Jan Kara
2014-09-16 21:07 ` Steven Rostedt
2014-09-16 21:22 ` Jan Kara
2014-09-16 21:33 ` Steven Rostedt
2014-09-17 14:18 ` Peter Zijlstra
2014-09-17 14:22 ` Steven Rostedt
2014-09-17 22:36 ` Peter Zijlstra
2014-09-18 0:31 ` Steven Rostedt
2014-09-18 17:34 ` Peter Zijlstra
2014-09-20 5:12 ` Jan Kara
2014-09-20 15:32 ` Steven Rostedt
2014-09-20 16:34 ` Markus Trippelsdorf
2014-09-20 15:47 ` Peter Zijlstra
2014-09-20 16:10 ` Joe Perches
2014-09-20 16:30 ` Steven Rostedt
2014-09-20 18:08 ` Peter Zijlstra
2014-09-20 18:01 ` Peter Zijlstra
2014-09-24 11:01 ` Jan Kara
2014-09-24 11:11 ` [PATCH v2] " Markus Trippelsdorf
2014-09-24 11:26 ` Jan Kara
2014-09-24 11:37 ` [PATCH v3] " Markus Trippelsdorf
2014-09-24 15:12 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2014-09-24 15:20 [PATCH] " Markus Trippelsdorf
2014-09-24 15:35 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140916144252.GB32118@x4 \
--to=markus@trippelsdorf.de \
--cc=akpm@linux-foundation.org \
--cc=geert@linux-m68k.org \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox