Skip to content

Commit

Permalink
um: console: Ignore console= option
Browse files Browse the repository at this point in the history
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 <mhiramat@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
mhiramat authored and richardweinberger committed Jul 5, 2017
1 parent 0936d4f commit 745a600
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/um/drivers/stdio_console.c
Expand Up @@ -192,6 +192,9 @@ __uml_exitcall(console_exit);

static int console_chan_setup(char *str)
{
if (!strncmp(str, "sole=", 5)) /* console= option specifies tty */
return 0;

line_setup(vt_conf, MAX_TTYS, &def_conf, str, "console");
return 1;
}
Expand Down

0 comments on commit 745a600

Please sign in to comment.