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 '')
-rw-r--r--debian/patches-rt/0165-tty-serial-pl011-Make-the-locking-work-on-RT.patch10
1 files changed, 5 insertions, 5 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 209ed61bd..6c52801fb 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,7 +1,7 @@
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 8 Jan 2013 21:36:51 +0100
-Subject: [PATCH 165/351] 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=ea773575f22c250996b10c85b48267f6266a47bb
+Subject: [PATCH 165/353] 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=0078406dbe103225ceb07433c4d141a02e66e775
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.
@@ -12,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 7de4bed1ddba..c93f742f1d9d 100644
+index d1f4882d9f40..2773d08e1d4a 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2215,13 +2215,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2227,13 +2227,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
clk_enable(uap->clk);
@@ -38,7 +38,7 @@ index 7de4bed1ddba..c93f742f1d9d 100644
/*
* First save the CR then disable the interrupts
-@@ -2247,8 +2253,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2259,8 +2265,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
pl011_write(old_cr, uap, REG_CR);
if (locked)