This reverts commit d03516df837587368fc6e75591f6329c072b9eb5. From Documentation/serial-console.txt we can know that serial port becomes the system console only when it appears in the kernel parameters as the last console device. But commit d03516df837587 adds a CON_CONSDEV flag to univ8250_console and breaks this convention. After that either we use "console=tty console=ttyS0" or "console=ttyS0 console=tty", serial port will always be the system console. Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Ce Sun <sunc@xxxxxxxxxx> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx> --- drivers/tty/serial/8250/8250_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index 240a361..e8819aa 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -675,7 +675,7 @@ static struct console univ8250_console = { .device = uart_console_device, .setup = univ8250_console_setup, .match = univ8250_console_match, - .flags = CON_PRINTBUFFER | CON_ANYTIME | CON_CONSDEV, + .flags = CON_PRINTBUFFER | CON_ANYTIME, .index = -1, .data = &serial8250_reg, }; -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html