--- zzzz-none-000/linux-4.19.183/drivers/tty/serial/bcm63xx_uart.c 2021-03-24 10:07:39.000000000 +0000 +++ bcm63-7530ax-756/linux-4.19.183/drivers/tty/serial/bcm63xx_uart.c 2023-06-28 08:54:20.000000000 +0000 @@ -700,11 +700,14 @@ unsigned int count) { struct uart_port *port; +#if !defined(CONFIG_BCM_KF_PRINTK_INT_ENABLED) || !defined(CONFIG_BCM_PRINTK_INT_ENABLED) unsigned long flags; int locked; +#endif port = &ports[co->index]; +#if !defined(CONFIG_BCM_KF_PRINTK_INT_ENABLED) || !defined(CONFIG_BCM_PRINTK_INT_ENABLED) local_irq_save(flags); if (port->sysrq) { /* bcm_uart_interrupt() already took the lock */ @@ -715,6 +718,7 @@ spin_lock(&port->lock); locked = 1; } +#endif /* call helper to deal with \r\n */ uart_console_write(port, s, count, bcm_console_putchar); @@ -722,9 +726,11 @@ /* and wait for char to be transmitted */ wait_for_xmitr(port); +#if !defined(CONFIG_BCM_KF_PRINTK_INT_ENABLED) || !defined(CONFIG_BCM_PRINTK_INT_ENABLED) if (locked) spin_unlock(&port->lock); local_irq_restore(flags); +#endif } /*