summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2018-09-03 15:10:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-20 09:15:04 +0200
commit1fa5208a30e645355b8946bf8645710381d4e735 (patch)
treeb9ec6dbbf6dd1ec6a3314c69ab4df455f2de2d73
parentedbcdafac3e44346b8f8321a03b5434c26cddb80 (diff)
downloadlinux-stable-1fa5208a30e645355b8946bf8645710381d4e735.tar.gz
linux-stable-1fa5208a30e645355b8946bf8645710381d4e735.tar.bz2
linux-stable-1fa5208a30e645355b8946bf8645710381d4e735.zip
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>
-rw-r--r--drivers/tty/serial/xilinx_uartps.c2
1 files changed, 1 insertions, 1 deletions
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;