diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2015-01-02 10:05:13 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-27 08:29:39 -0800 |
| commit | ac5a275b1437ded4e2da7fce8d0af298e6f7c4d8 (patch) | |
| tree | 6e8e7b3048346b9e6b150876a86de1e19bd99cd6 /drivers | |
| parent | 52925954eb7d35287c51afd152ad4e237758f4f4 (diff) | |
| download | lwn-ac5a275b1437ded4e2da7fce8d0af298e6f7c4d8.tar.gz lwn-ac5a275b1437ded4e2da7fce8d0af298e6f7c4d8.zip | |
serial: fix parisc boot hang
commit 68ed7e1c3d236e9e1e60ed6cae22f2c1c4ba2952 upstream.
This is a partial revert of 2f2dafe (serial: serial_core.c: printk
replacement) which gets us booting again. The real problem seems to be
the _emit path in early boot. However, until we can root cause it, we
need at least to get boot working.
Fixes: 2f2dafe77df2c78e189a9fa6b1879dffd06ae5a1
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index eaeb9a02c7fe..a28dee9d5017 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2102,7 +2102,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port) break; } - dev_info(port->dev, "%s%d at %s (irq = %d, base_baud = %d) is a %s\n", + printk(KERN_INFO "%s%s%s%d at %s (irq = %d, base_baud = %d) is a %s\n", + port->dev ? dev_name(port->dev) : "", + port->dev ? ": " : "", drv->dev_name, drv->tty_driver->name_base + port->line, address, port->irq, port->uartclk / 16, uart_type(port)); |