Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit deb091c

Browse files
committed
Revert "printk: Flag register_console() if console is set on command line"
This reverts commit b73c9cb. Let's roll back all of the serial core and printk console changes that went into 6.10-rc1 as there still are problems with them that need to be sorted out. Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1 Reported-by: Petr Mladek <pmladek@suse.com> Reported-by: Tony Lindgren <tony@atomide.com> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: John Ogness <john.ogness@linutronix.de> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a5e4bb6 commit deb091c

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

kernel/printk/printk.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2504,9 +2504,6 @@ static int __init console_setup(char *str)
25042504
if (console_opt_save(str, brl_options))
25052505
return 1;
25062506

2507-
/* Flag register_console() to not call try_enable_default_console() */
2508-
console_set_on_cmdline = 1;
2509-
25102507
/* Don't attempt to parse a DEVNAME:0.0 style console */
25112508
if (strchr(str, ':'))
25122509
return 1;
@@ -3522,7 +3519,7 @@ void register_console(struct console *newcon)
35223519
* Note that a console with tty binding will have CON_CONSDEV
35233520
* flag set and will be first in the list.
35243521
*/
3525-
if (preferred_console < 0 && !console_set_on_cmdline) {
3522+
if (preferred_console < 0) {
35263523
if (hlist_empty(&console_list) || !console_first()->device ||
35273524
console_first()->flags & CON_BOOT) {
35283525
try_enable_default_console(newcon);

0 commit comments

Comments
 (0)