53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From a302770bfedc850e9cca7d4334d15bc0c5076eb6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <a302770bfedc850e9cca7d4334d15bc0c5076eb6.1601675152.git.zanussi@kernel.org>
|
|
In-Reply-To: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
References: <5b5a156f9808b1acf1205606e03da117214549ea.1601675151.git.zanussi@kernel.org>
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 28 Jul 2011 13:32:57 +0200
|
|
Subject: [PATCH 164/333] tty/serial/omap: Make the locking RT aware
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.148-rt64.tar.xz
|
|
|
|
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 6420ae581a80..0f4f41ed9ffa 100644
|
|
--- a/drivers/tty/serial/omap-serial.c
|
|
+++ b/drivers/tty/serial/omap-serial.c
|
|
@@ -1307,13 +1307,10 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
|
|
pm_runtime_get_sync(up->dev);
|
|
|
|
- local_irq_save(flags);
|
|
- if (up->port.sysrq)
|
|
- locked = 0;
|
|
- else if (oops_in_progress)
|
|
- locked = spin_trylock(&up->port.lock);
|
|
+ if (up->port.sysrq || oops_in_progress)
|
|
+ locked = spin_trylock_irqsave(&up->port.lock, flags);
|
|
else
|
|
- spin_lock(&up->port.lock);
|
|
+ spin_lock_irqsave(&up->port.lock, flags);
|
|
|
|
/*
|
|
* First save the IER then disable the interrupts
|
|
@@ -1342,8 +1339,7 @@ serial_omap_console_write(struct console *co, const char *s,
|
|
pm_runtime_mark_last_busy(up->dev);
|
|
pm_runtime_put_autosuspend(up->dev);
|
|
if (locked)
|
|
- spin_unlock(&up->port.lock);
|
|
- local_irq_restore(flags);
|
|
+ spin_unlock_irqrestore(&up->port.lock, flags);
|
|
}
|
|
|
|
static int __init
|
|
--
|
|
2.17.1
|
|
|