Skip to content

Commit 422c972

Browse files
jognessgregkh
authored andcommitted
serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()"
The 8250 driver no longer depends on @oops_in_progress and will no longer violate the port->lock locking constraints. This reverts commit 3d9e6f5. Signed-off-by: John Ogness <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b63e6f6 commit 422c972

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/tty/serial/8250/8250_port.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,9 @@ static void __serial8250_clear_IER(struct uart_8250_port *up)
726726

727727
static inline void serial8250_clear_IER(struct uart_8250_port *up)
728728
{
729+
/* Port locked to synchronize UART_IER access against the console */
730+
lockdep_assert_held_once(&up->port.lock);
731+
729732
__serial8250_clear_IER(up);
730733
}
731734

0 commit comments

Comments
 (0)