summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@kernel.org>2017-05-18 02:20:39 +0900
committerRichard Weinberger <richard@nod.at>2017-07-05 23:18:48 +0200
commit745a600cf1a6230f5e3910c340dcb312b718e114 (patch)
tree65032403fb21cf4fdd03b0eaef02aaaf31e4e75c /arch/um
parent0936d4f3d5a3d5daf453bc341f02ba4e68cfe40e (diff)
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 <mhiramat@kernel.org> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/stdio_console.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 7b361f36ca96..c90817b04da9 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -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;
}