[PATCH 3/5] serial: xuartps: Remove __init marking from early write

From	Jeffy Chen <jeffy.chen@rock-chips.com>
Newsgroups	linux.kernel
Subject	[PATCH 3/5] serial: xuartps: Remove __init marking from early write
Date	2017-07-18 08:10 +0200
Message-ID	<u4tRM-7a0-21@gated-at.bofh.it> (permalink)
References	<u4tRL-7a0-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The earlycon would be alive outside the init code in these cases:
1/ we have keep_bootcon in cmdline.
2/ we don't have a real console to switch to.

So remove the __init marking to avoid invalid memory access.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

 drivers/tty/serial/xilinx_uartps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index fde55dc..31a630a 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -1163,7 +1163,7 @@ static void cdns_uart_console_putchar(struct uart_port *port, int ch)
 	writel(ch, port->membase + CDNS_UART_FIFO);
 }
 
-static void __init cdns_early_write(struct console *con, const char *s,
+static void cdns_early_write(struct console *con, const char *s,
 				    unsigned n)
 {
 	struct earlycon_device *dev = con->data;
-- 
2.1.4

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

Thread

[PATCH 3/5] serial: xuartps: Remove __init marking from early write Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-07-18 08:10 +0200

csiph-web