tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

serial: fix 8250 early console setup

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@gmx.ch>
Cc: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Daniel Ritz and committed by
Linus Torvalds b6b1d877 1a3f2ea3

+3 -3
+1 -1
drivers/serial/8250.c
··· 2514 2514 return uart_set_options(port, co, baud, parity, bits, flow); 2515 2515 } 2516 2516 2517 - static int __init serial8250_console_early_setup(void) 2517 + static int serial8250_console_early_setup(void) 2518 2518 { 2519 2519 return serial8250_find_port_for_earlycon(); 2520 2520 }
+1 -1
drivers/serial/8250_early.c
··· 227 227 return 0; 228 228 } 229 229 230 - int __init serial8250_find_port_for_earlycon(void) 230 + int serial8250_find_port_for_earlycon(void) 231 231 { 232 232 struct early_serial8250_device *device = &early_device; 233 233 struct uart_port *port = &device->port;
+1 -1
kernel/printk.c
··· 732 732 return 0; 733 733 } 734 734 735 - int __init update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options) 735 + int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options) 736 736 { 737 737 struct console_cmdline *c; 738 738 int i;