public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Elder <elder@linaro.org>
To: akpm@linux-foundation.org
Cc: kay@vrfy.org, pmladek@suse.cz, bp@suse.de,
	john.stultz@linaro.org, jack@suse.cz,
	linux-kernel@vger.kernel.org
Subject: [PATCH v5 1/7] printk: report dropped messages on separate line
Date: Mon, 21 Jul 2014 08:02:35 -0500	[thread overview]
Message-ID: <1405947761-26004-2-git-send-email-elder@linaro.org> (raw)
In-Reply-To: <1405947761-26004-1-git-send-email-elder@linaro.org>

It is possible for the log to be filled too quickly for the consoles
to be able to keep up.  This is detected in console_unlock(), and when
it occurs, a message is inserted to note the event.  When reviewing
some nearby code, Petr Mládek suggested it might be nicer if this
message were placed on a separate line.  This patch implements that
suggestion.

Suggested-by: Petr Mládek <pmladek@suse.cz>
Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Petr Mládek <pmladek@suse.cz>
---
 kernel/printk/printk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 13e839d..ffc9928 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2142,9 +2142,10 @@ again:
 		}
 
 		if (console_seq < log_first_seq) {
-			len = sprintf(text, "** %u printk messages dropped ** ",
+			len = sprintf(text,
+				      "%s** %u printk messages dropped **\n",
+				      (console_prev & LOG_CONT) ? "\n" : "",
 				      (unsigned)(log_first_seq - console_seq));
-
 			/* messages are gone, move to first one */
 			console_seq = log_first_seq;
 			console_idx = log_first_idx;
-- 
1.9.1


  reply	other threads:[~2014-07-21 13:02 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-21 13:02 [PATCH v5 0/7] printk: start simplifying some flags Alex Elder
2014-07-21 13:02 ` Alex Elder [this message]
2014-07-21 13:02 ` [PATCH v5 2/7] printk: insert newline for truncated records Alex Elder
2014-07-22  9:45   ` Petr Mládek
2014-07-21 13:02 ` [PATCH v5 3/7] printk: initialize syslog_prev and console_prev Alex Elder
2014-07-22 11:48   ` Alex Elder
2014-07-22 12:01     ` Petr Mládek
2014-07-21 13:02 ` [PATCH v5 4/7] printk: LOG_CONT and LOG_NEWLINE are opposites Alex Elder
2014-07-21 13:02 ` [PATCH v5 5/7] printk: honor LOG_PREFIX in devkmsg_read() Alex Elder
2014-07-21 13:02 ` [PATCH v5 6/7] printk: honor LOG_PREFIX in msg_print_text() Alex Elder
2014-07-21 13:02 ` [PATCH v5 7/7] printk: correct some more typos Alex Elder
2014-07-22 10:04 ` [PATCH v5 0/7] printk: start simplifying some flags Petr Mládek
2014-07-22 11:23   ` Alex Elder

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=1405947761-26004-2-git-send-email-elder@linaro.org \
    --to=elder@linaro.org \
    --cc=akpm@linux-foundation.org \
    --cc=bp@suse.de \
    --cc=jack@suse.cz \
    --cc=john.stultz@linaro.org \
    --cc=kay@vrfy.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmladek@suse.cz \
    /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