Revert "printk: Flag register_console() if console is set on command line"

This reverts commit b73c9cbe4f1fc02645228aa575998dd54067f8ef.

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 <[email protected]>
Reported-by: Tony Lindgren <[email protected]>
Cc: Jiri Slaby <[email protected]>
Cc: John Ogness <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Ilpo Järvinen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 420fd310129d4b2a05612c57c7c8b4b9605bee99..e6e6a47acec833cd70dcdf30884bf3c7eec2d6bb 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -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;
@@ -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);