[PATCH v3 6/6] um: console: Ignore console= option

From	Masami Hiramatsu <mhiramat@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH v3 6/6] um: console: Ignore console= option
Date	2017-05-17 19:30 +0200
Message-ID	<tIaVQ-5Z9-21@gated-at.bofh.it> (permalink)
References	<tIaM9-5Vz-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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>
---
 arch/um/drivers/stdio_console.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 7b361f3..c90817b 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;
 }

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/6] um: Output messages to stderr and support quiet option Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:20 +0200
  [PATCH v3 1/6] um: Use printk instead of printf in make_uml_dir Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:20 +0200
  [PATCH v3 4/6] um: Add os_warn() for pre-boot warning/error messages Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:20 +0200
  [PATCH v3 5/6] um: Use os_warn to print out pre-boot warning/error messages Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:30 +0200
  [PATCH v3 3/6] um: Use os_info for the messages on normal path Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:30 +0200
  [PATCH v3 2/6] um: Add os_info() for pre-boot information messages Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:30 +0200
  [PATCH v3 6/6] um: console: Ignore console= option Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-17 19:30 +0200

csiph-web