mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
serial: omap: 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>
This commit is contained in:
parent
ac1e696559
commit
b38dd0e8ed
1 changed files with 6 additions and 7 deletions
|
@ -1235,21 +1235,20 @@ static int serial_omap_poll_get_char(struct uart_port *port)
|
|||
#ifdef CONFIG_SERIAL_OMAP_CONSOLE
|
||||
|
||||
#ifdef CONFIG_SERIAL_EARLYCON
|
||||
static unsigned int __init omap_serial_early_in(struct uart_port *port,
|
||||
int offset)
|
||||
static unsigned int omap_serial_early_in(struct uart_port *port, int offset)
|
||||
{
|
||||
offset <<= port->regshift;
|
||||
return readw(port->membase + offset);
|
||||
}
|
||||
|
||||
static void __init omap_serial_early_out(struct uart_port *port, int offset,
|
||||
int value)
|
||||
static void omap_serial_early_out(struct uart_port *port, int offset,
|
||||
int value)
|
||||
{
|
||||
offset <<= port->regshift;
|
||||
writew(value, port->membase + offset);
|
||||
}
|
||||
|
||||
static void __init omap_serial_early_putc(struct uart_port *port, int c)
|
||||
static void omap_serial_early_putc(struct uart_port *port, int c)
|
||||
{
|
||||
unsigned int status;
|
||||
|
||||
|
@ -1262,8 +1261,8 @@ static void __init omap_serial_early_putc(struct uart_port *port, int c)
|
|||
omap_serial_early_out(port, UART_TX, c);
|
||||
}
|
||||
|
||||
static void __init early_omap_serial_write(struct console *console,
|
||||
const char *s, unsigned int count)
|
||||
static void early_omap_serial_write(struct console *console, const char *s,
|
||||
unsigned int count)
|
||||
{
|
||||
struct earlycon_device *device = console->data;
|
||||
struct uart_port *port = &device->port;
|
||||
|
|
Loading…
Reference in a new issue