The patch titled
serial: fix 8250 early console setup
has been added to the -mm tree. Its filename is
serial-fix-8250-early-console-setup.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: serial: fix 8250 early console setup
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>
The early setup function serial8250_console_early_setup() can be called
from non __init code (eg. hotpluggable serial ports like serial_cs) so
remove the __init from the call chain to avoid crashes.
Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Yinghai Lu <yinghai.lu@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/serial/8250.c | 2 +-
drivers/serial/8250_early.c | 2 +-
kernel/printk.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/serial/8250.c~serial-fix-8250-early-console-setup drivers/serial/8250.c
--- a/drivers/serial/8250.c~serial-fix-8250-early-console-setup
+++ a/drivers/serial/8250.c
@@ -2514,7 +2514,7 @@ static int __init serial8250_console_set
return uart_set_options(port, co, baud, parity, bits, flow);
}
-static int __init serial8250_console_early_setup(void)
+static int serial8250_console_early_setup(void)
{
return serial8250_find_port_for_earlycon();
}
diff -puN drivers/serial/8250_early.c~serial-fix-8250-early-console-setup drivers/serial/8250_early.c
--- a/drivers/serial/8250_early.c~serial-fix-8250-early-console-setup
+++ a/drivers/serial/8250_early.c
@@ -227,7 +227,7 @@ int __init setup_early_serial8250_consol
return 0;
}
-int __init serial8250_find_port_for_earlycon(void)
+int serial8250_find_port_for_earlycon(void)
{
struct early_serial8250_device *device = &early_device;
struct uart_port *port = &device->port;
diff -puN kernel/printk.c~serial-fix-8250-early-console-setup kernel/printk.c
--- a/kernel/printk.c~serial-fix-8250-early-console-setup
+++ a/kernel/printk.c
@@ -732,7 +732,7 @@ int __init add_preferred_console(char *n
return 0;
}
-int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
+int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options)
{
struct console_cmdline *c;
int i;
_
Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are
origin.patch
serial-fix-8250-early-console-setup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
