OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers-tty-pl011-irq-disable-madness.patch 

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2013-01-08 21:36:51 +01:00 committed by Alibek Omarov
parent c564c05244
commit 9e1befb3d6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/serial/amba-pl011.c
View File

@ -1919,13 +1919,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
clk_enable(uap->clk);
local_irq_save(flags);
/*
* local_irq_save(flags);
*
* This local_irq_save() is nonsense. If we come in via sysrq
* handling then interrupts are already disabled. Aside of
* that the port.sysrq check is racy on SMP regardless.
*/
if (uap->port.sysrq)
locked = 0;
else if (oops_in_progress)
locked = spin_trylock(&uap->port.lock);
locked = spin_trylock_irqsave(&uap->port.lock, flags);
else
spin_lock(&uap->port.lock);
spin_lock_irqsave(&uap->port.lock, flags);
/*
* First save the CR then disable the interrupts
@ -1947,8 +1953,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
writew(old_cr, uap->port.membase + UART011_CR);
if (locked)
spin_unlock(&uap->port.lock);
local_irq_restore(flags);
spin_unlock_irqrestore(&uap->port.lock, flags);
clk_disable(uap->clk);
}