Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sparc: serial: Clean up the locking for -rt

Browse source 
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Allen Pais <allen.pais@oracle.com>
This commit is contained in:
David Miller 2014-03-04 15:28:35 -05:00 committed by David S. Miller
parent c3bebc71c4
commit e58e241c17
4 changed files with 25 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/tty/serial/sunhv.c
View file

@ -433,13 +433,10 @@ static void sunhv_console_write_paged(struct console *con, const char *s, unsign
unsigned long flags; unsigned long flags;
int locked = 1; int locked = 1;
local_irq_save(flags); if (port->sysrq || oops_in_progress)
if (port->sysrq) { locked = spin_trylock_irqsave(&port->lock, flags);
locked = 0; else
} else if (oops_in_progress) { spin_lock_irqsave(&port->lock, flags);
locked = spin_trylock(&port->lock);
} else
spin_lock(&port->lock);
while (n > 0) { while (n > 0) {
unsigned long ra = __pa(con_write_page); unsigned long ra = __pa(con_write_page);
@ -470,8 +467,7 @@ static void sunhv_console_write_paged(struct console *con, const char *s, unsign
} }
if (locked) if (locked)
spin_unlock(&port->lock); spin_unlock_irqrestore(&port->lock, flags);
local_irq_restore(flags);
} }
static inline void sunhv_console_putchar(struct uart_port *port, char c) static inline void sunhv_console_putchar(struct uart_port *port, char c)
@ -492,7 +488,10 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
unsigned long flags; unsigned long flags;
int i, locked = 1; int i, locked = 1;
local_irq_save(flags); if (port->sysrq || oops_in_progress)
locked = spin_trylock_irqsave(&port->lock, flags);
else
spin_lock_irqsave(&port->lock, flags);
if (port->sysrq) { if (port->sysrq) {
locked = 0; locked = 0;
} else if (oops_in_progress) { } else if (oops_in_progress) {
@ -507,8 +506,7 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
} }
if (locked) if (locked)
spin_unlock(&port->lock); spin_unlock_irqrestore(&port->lock, flags);
local_irq_restore(flags);
} }
static struct console sunhv_console = { static struct console sunhv_console = {

14
drivers/tty/serial/sunsab.c
View file

@ -844,20 +844,16 @@ static void sunsab_console_write(struct console *con, const char *s, unsigned n)
unsigned long flags; unsigned long flags;
int locked = 1; int locked = 1;
local_irq_save(flags); if (up->port.sysrq || oops_in_progress)
if (up->port.sysrq) { locked = spin_trylock_irqsave(&up->port.lock, flags);
locked = 0; else
} else if (oops_in_progress) { spin_lock_irqsave(&up->port.lock, flags);
locked = spin_trylock(&up->port.lock);
} else
spin_lock(&up->port.lock);
uart_console_write(&up->port, s, n, sunsab_console_putchar); uart_console_write(&up->port, s, n, sunsab_console_putchar);
sunsab_tec_wait(up); sunsab_tec_wait(up);
if (locked) if (locked)
spin_unlock(&up->port.lock); spin_unlock_irqrestore(&up->port.lock, flags);
local_irq_restore(flags);
} }
static int sunsab_console_setup(struct console *con, char *options) static int sunsab_console_setup(struct console *con, char *options)

14
drivers/tty/serial/sunsu.c
View file

@ -1295,13 +1295,10 @@ static void sunsu_console_write(struct console *co, const char *s,
unsigned int ier; unsigned int ier;
int locked = 1; int locked = 1;
local_irq_save(flags); if (up->port.sysrq || oops_in_progress)
if (up->port.sysrq) { locked = spin_trylock_irqsave(&up->port.lock, flags);
locked = 0; else
} else if (oops_in_progress) { spin_lock_irqsave(&up->port.lock, flags);
locked = spin_trylock(&up->port.lock);
} else
spin_lock(&up->port.lock);
/* /*
* First save the UER then disable the interrupts * First save the UER then disable the interrupts
@ -1319,8 +1316,7 @@ static void sunsu_console_write(struct console *co, const char *s,
serial_out(up, UART_IER, ier); serial_out(up, UART_IER, ier);
if (locked) if (locked)
spin_unlock(&up->port.lock); spin_unlock_irqrestore(&up->port.lock, flags);
local_irq_restore(flags);
} }
/* /*

14
drivers/tty/serial/sunzilog.c
View file

@ -1195,20 +1195,16 @@ sunzilog_console_write(struct console *con, const char *s, unsigned int count)
unsigned long flags; unsigned long flags;
int locked = 1; int locked = 1;
local_irq_save(flags); if (up->port.sysrq || oops_in_progress)
if (up->port.sysrq) { locked = spin_trylock_irqsave(&up->port.lock, flags);
locked = 0; else
} else if (oops_in_progress) { spin_lock_irqsave(&up->port.lock, flags);
locked = spin_trylock(&up->port.lock);
} else
spin_lock(&up->port.lock);
uart_console_write(&up->port, s, count, sunzilog_putchar); uart_console_write(&up->port, s, count, sunzilog_putchar);
udelay(2); udelay(2);
if (locked) if (locked)
spin_unlock(&up->port.lock); spin_unlock_irqrestore(&up->port.lock, flags);
local_irq_restore(flags);
} }
static int __init sunzilog_console_setup(struct console *con, char *options) static int __init sunzilog_console_setup(struct console *con, char *options)