Skip to content

Commit

Permalink
Revert "printk: Flag register_console() if console is set on command …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Greg Kroah-Hartman committed Jun 25, 2024
1 parent a5e4bb6 commit deb091c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions kernel/printk/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -2504,9 +2504,6 @@ static int __init console_setup(char *str)
if (console_opt_save(str, brl_options))
return 1;

/* Flag register_console() to not call try_enable_default_console() */
console_set_on_cmdline = 1;

/* Don't attempt to parse a DEVNAME:0.0 style console */
if (strchr(str, ':'))
return 1;
Expand Down Expand Up @@ -3522,7 +3519,7 @@ void register_console(struct console *newcon)
* Note that a console with tty binding will have CON_CONSDEV
* flag set and will be first in the list.
*/
if (preferred_console < 0 && !console_set_on_cmdline) {
if (preferred_console < 0) {
if (hlist_empty(&console_list) || !console_first()->device ||
console_first()->flags & CON_BOOT) {
try_enable_default_console(newcon);
Expand Down

0 comments on commit deb091c

Please sign in to comment.