summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 03:44:23 +0000
commit38db540ee6930dafa84973fa1c493128ed23d810 (patch)
treee2826f458afdbe0c6d40f534d8bc98dae3db836e /debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
parentMerging upstream version 4.19.269. (diff)
downloadlinux-38db540ee6930dafa84973fa1c493128ed23d810.tar.xz
linux-38db540ee6930dafa84973fa1c493128ed23d810.zip
Merging debian version 4.19.269-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch')
-rw-r--r--debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch b/debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
index e80b1a15e..838a8f725 100644
--- a/debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
+++ b/debian/patches-rt/0168-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 11 Apr 2016 16:55:02 +0200
-Subject: [PATCH 168/342] tty: serial: 8250: don't take the trylock during oops
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=9baedf4a77e41542731e04db12fe39ec29b3f547
+Subject: [PATCH 168/351] tty: serial: 8250: don't take the trylock during oops
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=d293d6a4bedffd2f361e3057a0290331aab3caa7
An oops with irqs off (panic() from irqsafe hrtimer like the watchdog
timer) will lead to a lockdep warning on each invocation and as such
@@ -14,10 +14,10 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index f11d1202566e..33d489691fdf 100644
+index 6fc89888a52e..15a92d855ca7 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
-@@ -3298,10 +3298,8 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3303,10 +3303,8 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
serial8250_rpm_get(up);