| Message ID | 1405692859-32500-2-git-send-email-elder@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 07/18/2014 09:14 AM, Alex Elder wrote: > 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 printed on the console. 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> > --- > 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..bed8f09 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** %llu printk messages dropped **\n", ^^^ This is wrong, an artifact I didn't clean up. It should still just be "%u". Sorry about that. -Alex > + (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; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13e839d..bed8f09 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** %llu 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;
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 printed on the console. 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> --- kernel/printk/printk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)