Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'printk-for-4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk
Pull printk fix from Petr Mladek:
"Revert a commit that caused "quiet", "debug", and "loglevel" early
parameters to be ignored for early boot messages"
* tag 'printk-for-4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
Revert "printk: make sure to print log on console."
+5
-7
+5
-7
kernel/printk/printk.c
+5
-7
kernel/printk/printk.c
···
351
351
*/
352
352
353
353
enum log_flags {
354
-
LOG_NOCONS = 1, /* suppress print, do not print to console */
355
354
LOG_NEWLINE = 2, /* text ended with a newline */
356
355
LOG_PREFIX = 4, /* text started with a prefix */
357
356
LOG_CONT = 8, /* text is a fragment of a continuation line */
···
1880
1881
if (dict)
1881
1882
lflags |= LOG_PREFIX|LOG_NEWLINE;
1882
1883
1883
-
if (suppress_message_printing(level))
1884
-
lflags |= LOG_NOCONS;
1885
-
1886
1884
return log_output(facility, level, lflags,
1887
1885
dict, dictlen, text, text_len);
1888
1886
}
···
2028
2032
const char *text, size_t len) {}
2029
2033
static size_t msg_print_text(const struct printk_log *msg,
2030
2034
bool syslog, char *buf, size_t size) { return 0; }
2035
+
static bool suppress_message_printing(int level) { return false; }
2031
2036
2032
2037
#endif /* CONFIG_PRINTK */
2033
2038
···
2365
2368
break;
2366
2369
2367
2370
msg = log_from_idx(console_idx);
2368
-
if (msg->flags & LOG_NOCONS) {
2371
+
if (suppress_message_printing(msg->level)) {
2369
2372
/*
2370
-
* Skip record if !ignore_loglevel, and
2371
-
* record has level above the console loglevel.
2373
+
* Skip record we have buffered and already printed
2374
+
* directly to the console when we received it, and
2375
+
* record that has level above the console loglevel.
2372
2376
*/
2373
2377
console_idx = log_next(console_idx);
2374
2378
console_seq++;