lkml.org 
[lkml]   [2015]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] printk: Warn about dropped messages also on extended consoles
Date
The commit #6fe29354befe4c ("printk: implement support for extended console
drivers") added an extra buffer to format messages for extended consoles.
We need to put there also the warning about dropped messages, so it appears
on these consoles.

Signed-off-by: Petr Mladek <pmladek@suse.com>
---
kernel/printk/printk.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index cf8c24203368..77d3d3698283 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2254,8 +2254,15 @@ again:
}

if (console_seq < log_first_seq) {
- len = sprintf(text, "** %u printk messages dropped ** ",
- (unsigned)(log_first_seq - console_seq));
+ static const char dropped_msg[] =
+ "** %u printk messages dropped ** ";
+ unsigned int dropped_count =
+ (unsigned int)(log_first_seq - console_seq);
+
+ len = sprintf(text, dropped_msg, dropped_count);
+ if (nr_ext_console_drivers)
+ ext_len = sprintf(ext_text, dropped_msg,
+ dropped_count);

/* messages are gone, move to first one */
console_seq = log_first_seq;
@@ -2290,8 +2297,8 @@ skip:
len += msg_print_text(msg, console_prev, false,
text + len, sizeof(text) - len);
if (nr_ext_console_drivers) {
- ext_len = msg_print_ext_header(ext_text,
- sizeof(ext_text),
+ ext_len += msg_print_ext_header(ext_text + ext_len,
+ sizeof(ext_text) - ext_len,
msg, console_seq, console_prev);
ext_len += msg_print_ext_body(ext_text + ext_len,
sizeof(ext_text) - ext_len,
--
1.8.5.6


\
 
 \ /
  Last update: 2015-07-30 18:21    [W:0.072 / U:0.556 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site