From: Jeffrey Hugo Date: Sun, 17 Feb 2019 05:05:52 +0000 (-0700) Subject: tty: serial: msm_serial: Remove __init from msm_console_setup() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be24c270185930997b55e20a859a954b2f4eaa46;p=linux.git tty: serial: msm_serial: Remove __init from msm_console_setup() Due to the complexities of modern Qualcomm SoCs, about a half dozen drivers must successfully probe before the clocks for the console are present, and the console can successfully probe. Depending on several random factors such as probe order and modules vs builtin, msm_serial may not be able to successfully probe for some, at which point, __init annotated functions may become unmapped. If this occurs, msm_console_setup() will be called from the probe path, but will no longer exist, resulting in a kernel panic. Resolve this issue by removing the __init annotation from msm_console_setup(). Signed-off-by: Jeffrey Hugo Reviewed-by: Bjorn Andersson Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index 736b74fd66237..109096033bb17 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -1634,7 +1634,7 @@ static void msm_console_write(struct console *co, const char *s, __msm_console_write(port, s, count, msm_port->is_uartdm); } -static int __init msm_console_setup(struct console *co, char *options) +static int msm_console_setup(struct console *co, char *options) { struct uart_port *port; int baud = 115200;