summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch')
-rw-r--r--debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch14
1 files changed, 5 insertions, 9 deletions
diff --git a/debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch b/debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch
index 6309f7e50..9bb7c51b0 100644
--- a/debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch
+++ b/debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch
@@ -1,8 +1,7 @@
-From e699af6cca35d036a6876b5c9ec0b1355cc16842 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 8 Jan 2013 21:36:51 +0100
-Subject: [PATCH 165/347] tty/serial/pl011: Make the locking work on RT
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
+Subject: [PATCH 165/342] tty/serial/pl011: Make the locking work on RT
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=4fdbc8d0d5cf770ae17bc4112cb279784d1e78de
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.
@@ -13,10 +12,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 5edc3813a9b9..7d4aee4c5091 100644
+index 7de4bed1ddba..c93f742f1d9d 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2196,13 +2196,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2215,13 +2215,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
clk_enable(uap->clk);
@@ -39,7 +38,7 @@ index 5edc3813a9b9..7d4aee4c5091 100644
/*
* First save the CR then disable the interrupts
-@@ -2228,8 +2234,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2247,8 +2253,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
pl011_write(old_cr, uap, REG_CR);
if (locked)
@@ -49,6 +48,3 @@ index 5edc3813a9b9..7d4aee4c5091 100644
clk_disable(uap->clk);
}
---
-2.36.1
-