diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:39:59 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:39:59 +0000 |
commit | 27d3313807296c3943a96ceef8c2b7279cb56962 (patch) | |
tree | 7d08e78c36ab6437b403fc7cd8c23e41f135c7a3 /debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch | |
parent | Merging upstream version 6.7.7. (diff) | |
download | linux-27d3313807296c3943a96ceef8c2b7279cb56962.tar.xz linux-27d3313807296c3943a96ceef8c2b7279cb56962.zip |
Adding debian version 6.7.7-1.debian/6.7.7-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch')
-rw-r--r-- | debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch b/debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch new file mode 100644 index 0000000000..1be252903e --- /dev/null +++ b/debian/patches-rt/0049-serial-8250-revert-drop-lockdep-annotation-from-seri.patch @@ -0,0 +1,29 @@ +From: John Ogness <john.ogness@linutronix.de> +Date: Mon, 2 Oct 2023 15:30:43 +0000 +Subject: [PATCH 49/50] serial: 8250: revert "drop lockdep annotation from + serial8250_clear_IER()" +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.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 +@@ -721,6 +721,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); + } + |