|
@@ -267,7 +267,7 @@ static struct console *exclusive_console;
|
|
|
|
|
|
static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
|
|
|
|
|
|
-static int selected_console = -1;
|
|
|
+static int preferred_console = -1;
|
|
|
int console_set_on_cmdline;
|
|
|
EXPORT_SYMBOL(console_set_on_cmdline);
|
|
|
|
|
@@ -1907,14 +1907,14 @@ static int __add_preferred_console(char *name, int idx, char *options,
|
|
|
i++, c++) {
|
|
|
if (strcmp(c->name, name) == 0 && c->index == idx) {
|
|
|
if (!brl_options)
|
|
|
- selected_console = i;
|
|
|
+ preferred_console = i;
|
|
|
return 0;
|
|
|
}
|
|
|
}
|
|
|
if (i == MAX_CMDLINECONSOLES)
|
|
|
return -E2BIG;
|
|
|
if (!brl_options)
|
|
|
- selected_console = i;
|
|
|
+ preferred_console = i;
|
|
|
strlcpy(c->name, name, sizeof(c->name));
|
|
|
c->options = options;
|
|
|
braille_set_options(c, brl_options);
|
|
@@ -2438,7 +2438,7 @@ void register_console(struct console *newcon)
|
|
|
bcon = console_drivers;
|
|
|
|
|
|
if (!has_preferred || bcon || !console_drivers)
|
|
|
- has_preferred = selected_console >= 0;
|
|
|
+ has_preferred = preferred_console >= 0;
|
|
|
|
|
|
/*
|
|
|
* See if we want to use this console driver. If we
|
|
@@ -2486,7 +2486,7 @@ void register_console(struct console *newcon)
|
|
|
}
|
|
|
|
|
|
newcon->flags |= CON_ENABLED;
|
|
|
- if (i == selected_console) {
|
|
|
+ if (i == preferred_console) {
|
|
|
newcon->flags |= CON_CONSDEV;
|
|
|
has_preferred = true;
|
|
|
}
|