Skip to content

Commit 745a600

Browse files
mhiramatrichardweinberger
authored andcommitted
um: console: Ignore console= option
Ignore linux kernel's console= option at uml's console option handler. Since uml's con= option is only for setting up new console, and Linux kernel's console= option specify to which console kernel output its message, we can use both option for different purpose. Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Richard Weinberger <[email protected]>
1 parent 0936d4f commit 745a600

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

arch/um/drivers/stdio_console.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ __uml_exitcall(console_exit);
192192

193193
static int console_chan_setup(char *str)
194194
{
195+
if (!strncmp(str, "sole=", 5)) /* console= option specifies tty */
196+
return 0;
197+
195198
line_setup(vt_conf, MAX_TTYS, &def_conf, str, "console");
196199
return 1;
197200
}

0 commit comments

Comments
 (0)