This reverts commit b73c9cbe4f1fc02645228aa575998dd54067f8ef. There is no need for this change now that we are reserving console_cmdline slots for the DEVNAME:0.0 style consoles. Signed-off-by: Tony Lindgren <tony.lindgren@xxxxxxxxxxxxxxx> --- kernel/printk/printk.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 52bdd7dcdb6f..8b746eeb77fa 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2541,9 +2541,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, ':')) { reserve_deferred_console(str); @@ -3578,7 +3575,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); -- 2.45.2