| From 09f8325356e2f968c2b78169b605550441505dc1 Mon Sep 17 00:00:00 2001 |
| From: Michal Simek <michal.simek@xilinx.com> |
| Date: Mon, 3 Sep 2018 15:10:49 +0200 |
| Subject: serial: uartps: console_setup() can't be placed to init section |
| |
| [ Upstream commit 4bb1ce2350a598502b23088b169e16b43d4bc639 ] |
| |
| When console device is rebinded, console_setup() is called again. |
| But marking it as __init means that function will be clear after boot is |
| complete. If console device is binded again console_setup() is not found |
| and error "Unable to handle kernel paging request at virtual address" |
| is reported. |
| |
| Signed-off-by: Michal Simek <michal.simek@xilinx.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 f438a2158006..b0da63737aa1 100644 |
| --- a/drivers/tty/serial/xilinx_uartps.c |
| +++ b/drivers/tty/serial/xilinx_uartps.c |
| @@ -1270,7 +1270,7 @@ static void cdns_uart_console_write(struct console *co, const char *s, |
| * |
| * Return: 0 on success, negative errno otherwise. |
| */ |
| -static int __init cdns_uart_console_setup(struct console *co, char *options) |
| +static int cdns_uart_console_setup(struct console *co, char *options) |
| { |
| struct uart_port *port = &cdns_uart_port[co->index]; |
| int baud = 9600; |
| -- |
| 2.19.1 |
| |
