Commit f67020a4 authored by Linus Torvalds's avatar Linus Torvalds

Revert the dodgy ia64 serial console changeset by Bjorn Helgaas.

It results in serial console getting initialised really late and the
suggested workaround is broken according to Keith. 

Cset exclude: akpm@osdl.org|ChangeSet|20040213234712|28554
parent ae4239ec
...@@ -1976,8 +1976,6 @@ static int __init serial8250_console_setup(struct console *co, char *options) ...@@ -1976,8 +1976,6 @@ static int __init serial8250_console_setup(struct console *co, char *options)
if (co->index >= UART_NR) if (co->index >= UART_NR)
co->index = 0; co->index = 0;
port = &serial8250_ports[co->index].port; port = &serial8250_ports[co->index].port;
if (port->type == PORT_UNKNOWN)
return -ENODEV;
/* /*
* Temporary fix. * Temporary fix.
...@@ -2009,14 +2007,6 @@ static int __init serial8250_console_init(void) ...@@ -2009,14 +2007,6 @@ static int __init serial8250_console_init(void)
} }
console_initcall(serial8250_console_init); console_initcall(serial8250_console_init);
static int __init serial8250_late_console_init(void)
{
if (!(serial8250_console.flags & CON_ENABLED))
register_console(&serial8250_console);
return 0;
}
late_initcall(serial8250_late_console_init);
#define SERIAL8250_CONSOLE &serial8250_console #define SERIAL8250_CONSOLE &serial8250_console
#else #else
#define SERIAL8250_CONSOLE NULL #define SERIAL8250_CONSOLE NULL
......
...@@ -1871,6 +1871,9 @@ uart_set_options(struct uart_port *port, struct console *co, ...@@ -1871,6 +1871,9 @@ uart_set_options(struct uart_port *port, struct console *co,
if (flow == 'r') if (flow == 'r')
termios.c_cflag |= CRTSCTS; termios.c_cflag |= CRTSCTS;
if (!port->ops)
return 0; /* "console=" on ia64 */
port->ops->set_termios(port, &termios, NULL); port->ops->set_termios(port, &termios, NULL);
co->cflag = termios.c_cflag; co->cflag = termios.c_cflag;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment