redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[SERIAL] 8250: sysrq deadlock fix

Browse source 
Fix http://bugzilla.kernel.org/show_bug.cgi?id=6716

Doing a sysrq over a serial line into an SMP machine presently deadlocks.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Andrew Morton 2006-06-30 02:29:59 -07:00 committed by Russell King
parent 3be91ec738
commit 68aa2c0d4a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/serial/8250.c
View file

@ -2252,10 +2252,14 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
touch_nmi_watchdog();
if (oops_in_progress) {
locked = spin_trylock_irqsave(&up->port.lock, flags);
local_irq_save(flags);
if (up->port.sysrq) {
/* serial8250_handle_port() already took the lock */
locked = 0;
} else if (oops_in_progress) {
locked = spin_trylock(&up->port.lock);
} else
spin_lock_irqsave(&up->port.lock, flags);
spin_lock(&up->port.lock);
/*
* First save the IER then disable the interrupts
@ -2277,7 +2281,8 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
serial_out(up, UART_IER, ier);
if (locked)
spin_unlock_irqrestore(&up->port.lock, flags);
spin_unlock(&up->port.lock);
local_irq_restore(flags);
}
static int serial8250_console_setup(struct console *co, char *options)