diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:11:49 +0000 |
commit | f25552c1068a054f2d99afd67a671d5991bf19c1 (patch) | |
tree | d70de5c7262ad572f8323fc4184b8a10522e81ec /debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch | |
parent | Merging upstream version 6.9.7. (diff) | |
download | linux-f25552c1068a054f2d99afd67a671d5991bf19c1.tar.xz linux-f25552c1068a054f2d99afd67a671d5991bf19c1.zip |
Merging debian version 6.9.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch')
-rw-r--r-- | debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch b/debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch deleted file mode 100644 index e9544b9f8c..0000000000 --- a/debian/patches-rt/0045-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: John Ogness <john.ogness@linutronix.de> -Date: Mon, 2 Oct 2023 15:30:43 +0000 -Subject: [PATCH 45/48] serial: 8250: Revert "drop lockdep annotation from - serial8250_clear_IER()" -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz - -The 8250 driver no longer depends on @oops_in_progress and -will no longer violate the port->lock locking constraints. - -This reverts commit 3d9e6f556e235ddcdc9f73600fdd46fe1736b090. - -Signed-off-by: John Ogness <john.ogness@linutronix.de> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - drivers/tty/serial/8250/8250_port.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/tty/serial/8250/8250_port.c -+++ b/drivers/tty/serial/8250/8250_port.c -@@ -723,6 +723,9 @@ static void __serial8250_clear_IER(struc - - static inline void serial8250_clear_IER(struct uart_8250_port *up) - { -+ /* Port locked to synchronize UART_IER access against the console. */ -+ lockdep_assert_held_once(&up->port.lock); -+ - __serial8250_clear_IER(up); - } - |