File tree Expand file tree Collapse file tree 1 file changed +1
-4
lines changed Expand file tree Collapse file tree 1 file changed +1
-4
lines changed Original file line number Diff line number Diff line change @@ -2504,9 +2504,6 @@ static int __init console_setup(char *str)
2504
2504
if (console_opt_save (str , brl_options ))
2505
2505
return 1 ;
2506
2506
2507
- /* Flag register_console() to not call try_enable_default_console() */
2508
- console_set_on_cmdline = 1 ;
2509
-
2510
2507
/* Don't attempt to parse a DEVNAME:0.0 style console */
2511
2508
if (strchr (str , ':' ))
2512
2509
return 1 ;
@@ -3522,7 +3519,7 @@ void register_console(struct console *newcon)
3522
3519
* Note that a console with tty binding will have CON_CONSDEV
3523
3520
* flag set and will be first in the list.
3524
3521
*/
3525
- if (preferred_console < 0 && ! console_set_on_cmdline ) {
3522
+ if (preferred_console < 0 ) {
3526
3523
if (hlist_empty (& console_list ) || !console_first ()-> device ||
3527
3524
console_first ()-> flags & CON_BOOT ) {
3528
3525
try_enable_default_console (newcon );
You can’t perform that action at this time.
0 commit comments