48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 40ebaf9abcb5b1d219eba80ba6648c0142b9fa12 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Molnar <mingo@elte.hu>
|
|
Date: Fri, 3 Jul 2009 08:30:01 -0500
|
|
Subject: [PATCH 211/267] serial: 8250: Clean up the locking for -rt
|
|
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
drivers/tty/serial/8250.c | 15 +++++----------
|
|
1 file changed, 5 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
|
|
index eeadf1b..43f7f46 100644
|
|
--- a/drivers/tty/serial/8250.c
|
|
+++ b/drivers/tty/serial/8250.c
|
|
@@ -2846,14 +2846,10 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
|
|
|
|
touch_nmi_watchdog();
|
|
|
|
- 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(&up->port.lock);
|
|
+ if (up->port.sysrq || oops_in_progress)
|
|
+ locked = spin_trylock_irqsave(&up->port.lock, flags);
|
|
+ else
|
|
+ spin_lock_irqsave(&up->port.lock, flags);
|
|
|
|
/*
|
|
* First save the IER then disable the interrupts
|
|
@@ -2885,8 +2881,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
|
|
check_modem_status(up);
|
|
|
|
if (locked)
|
|
- spin_unlock(&up->port.lock);
|
|
- local_irq_restore(flags);
|
|
+ spin_unlock_irqrestore(&up->port.lock, flags);
|
|
}
|
|
|
|
static int __init serial8250_console_setup(struct console *co, char *options)
|
|
--
|
|
1.7.10
|
|
|