]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()"
authorJohn Ogness <john.ogness@linutronix.de>
Tue, 7 Jan 2025 21:27:02 +0000 (22:33 +0106)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jan 2025 15:08:25 +0000 (16:08 +0100)
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>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20250107212702.169493-7-john.ogness@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_port.c

index 08466cf10d737ed38e0fa7ba4354950fd1899c86..76a8d74f16e8bd31be2faeef549fe7cfd035c64e 100644 (file)
@@ -726,6 +726,9 @@ static void __serial8250_clear_IER(struct uart_8250_port *up)
 
 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);
 }