diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-15 23:53:32 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-16 04:05:28 -0700 |
| commit | f3c681c028846bd5d39f563909409832a295ca69 (patch) | |
| tree | ff492b31f535a76f1d8ad82b916bb6293f550123 /drivers/serial/sunsab.c | |
| parent | 9918cc2e3275bf7f3561e4de1d5a3314183e71dc (diff) | |
| download | op-kernel-dev-f3c681c028846bd5d39f563909409832a295ca69.zip op-kernel-dev-f3c681c028846bd5d39f563909409832a295ca69.tar.gz | |
[SERIAL]: Fix console write locking in sparc drivers.
Mirror the logic in 8250 for proper console write locking
when SYSRQ is triggered or an OOPS is in progress.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index deb9ab4..8a0f9e4 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -860,22 +860,31 @@ static int num_channels; static void sunsab_console_putchar(struct uart_port *port, int c) { struct uart_sunsab_port *up = (struct uart_sunsab_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); sunsab_tec_wait(up); writeb(c, &up->regs->w.tic); - - spin_unlock_irqrestore(&up->port.lock, flags); } static void sunsab_console_write(struct console *con, const char *s, unsigned n) { struct uart_sunsab_port *up = &sunsab_ports[con->index]; + unsigned long flags; + int locked = 1; + + local_irq_save(flags); + if (up->port.sysrq) { + locked = 0; + } else if (oops_in_progress) { + locked = spin_trylock(&up->port.lock); + } else + spin_lock(&up->port.lock); uart_console_write(&up->port, s, n, sunsab_console_putchar); sunsab_tec_wait(up); + + if (locked) + spin_unlock(&up->port.lock); + local_irq_restore(flags); } static int sunsab_console_setup(struct console *con, char *options) |
