aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/xilinx_uartps.c
diff options
context:
space:
mode:
authorJeffy Chen <jeffy.chen@rock-chips.com>2017-07-18 14:02:56 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-30 07:38:50 -0700
commit99d2731678723b86a7fe17319214fdbe53e4fc0c (patch)
treefbdc56000643ace162cfe0477acf62c806d81215 /drivers/tty/serial/xilinx_uartps.c
parentserial: omap: Remove __init marking from early write (diff)
downloadlinux-dev-99d2731678723b86a7fe17319214fdbe53e4fc0c.tar.xz
linux-dev-99d2731678723b86a7fe17319214fdbe53e4fc0c.zip
serial: xuartps: Remove __init marking from early write
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> Reviewed-by: Douglas Anderson <dianders@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/xilinx_uartps.c')
-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 fde55dcdea5a..31a630ae0870 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;