浏览代码

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>
Masami Hiramatsu 8 年之前
父节点
当前提交
745a600cf1
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      arch/um/drivers/stdio_console.c

+ 3 - 0
arch/um/drivers/stdio_console.c

@@ -192,6 +192,9 @@ __uml_exitcall(console_exit);
 
 
 static int console_chan_setup(char *str)
 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");
 	line_setup(vt_conf, MAX_TTYS, &def_conf, str, "console");
 	return 1;
 	return 1;
 }
 }