|
@@ -349,7 +349,7 @@ static int console_msg_format = MSG_FORMAT_DEFAULT;
|
|
|
*/
|
|
|
|
|
|
enum log_flags {
|
|
|
- LOG_NOCONS = 1, /* already flushed, do not print to console */
|
|
|
+ LOG_NOCONS = 1, /* suppress print, do not print to console */
|
|
|
LOG_NEWLINE = 2, /* text ended with a newline */
|
|
|
LOG_PREFIX = 4, /* text started with a prefix */
|
|
|
LOG_CONT = 8, /* text is a fragment of a continuation line */
|
|
@@ -1886,6 +1886,9 @@ asmlinkage int vprintk_emit(int facility, int level,
|
|
|
if (dict)
|
|
|
lflags |= LOG_PREFIX|LOG_NEWLINE;
|
|
|
|
|
|
+ if (suppress_message_printing(level))
|
|
|
+ lflags |= LOG_NOCONS;
|
|
|
+
|
|
|
printed_len = log_output(facility, level, lflags, dict, dictlen, text, text_len);
|
|
|
|
|
|
logbuf_unlock_irqrestore(flags);
|
|
@@ -2349,11 +2352,10 @@ skip:
|
|
|
break;
|
|
|
|
|
|
msg = log_from_idx(console_idx);
|
|
|
- if (suppress_message_printing(msg->level)) {
|
|
|
+ if (msg->flags & LOG_NOCONS) {
|
|
|
/*
|
|
|
- * Skip record we have buffered and already printed
|
|
|
- * directly to the console when we received it, and
|
|
|
- * record that has level above the console loglevel.
|
|
|
+ * Skip record if !ignore_loglevel, and
|
|
|
+ * record has level above the console loglevel.
|
|
|
*/
|
|
|
console_idx = log_next(console_idx);
|
|
|
console_seq++;
|