mirror of
https://github.com/OpenVoiceOS/OpenVoiceOS
synced 2025-02-12 18:00:45 +01:00
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 89401e54f0f3071179726b129b0d924c1f33cba1 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 28 Jul 2011 13:32:57 +0200
|
|
Subject: [PATCH 176/195] tty/serial/omap: Make the locking RT aware
|
|
|
|
The lock is a sleeping lock and local_irq_save() is not the
|
|
optimsation we are looking for. Redo it to make it work on -RT and
|
|
non-RT.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
drivers/tty/serial/omap-serial.c | 12 ++++--------
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
|
|
index f4c6ff806465..1097fca22307 100644
|
|
--- a/drivers/tty/serial/omap-serial.c
|
|
+++ b/drivers/tty/serial/omap-serial.c
|
|
@@ -1212,13 +1212,10 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
unsigned int ier;
|
|
int locked = 1;
|
|
|
|
- local_irq_save(flags);
|
|
- if (up->port.sysrq)
|
|
- locked = 0;
|
|
- else if (oops_in_progress)
|
|
- locked = uart_port_trylock(&up->port);
|
|
+ if (up->port.sysrq || oops_in_progress)
|
|
+ locked = uart_port_trylock_irqsave(&up->port, &flags);
|
|
else
|
|
- uart_port_lock(&up->port);
|
|
+ uart_port_lock_irqsave(&up->port, &flags);
|
|
|
|
/*
|
|
* First save the IER then disable the interrupts
|
|
@@ -1245,8 +1242,7 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
check_modem_status(up);
|
|
|
|
if (locked)
|
|
- uart_port_unlock(&up->port);
|
|
- local_irq_restore(flags);
|
|
+ uart_port_unlock_irqrestore(&up->port, flags);
|
|
}
|
|
|
|
static int __init
|
|
--
|
|
2.43.0
|
|
|