Apply preempt_rt patch-4.9-rt1.patch.xz

[zynq/linux.git] / drivers / tty / serial / 8250 / 8250_port.c

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 1731b98d2471077c762806b63f88993b0a475fc3..5cc62301e840b30ce268cccebce87f23006e8b7b 100644 (file)
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -35,6 +35,7 @@
 #include <linux/nmi.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#include <linux/kdb.h>
 #include <linux/uaccess.h>
 #include <linux/pm_runtime.h>
 #include <linux/timer.h>
@@ -3144,9 +3145,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
 
        serial8250_rpm_get(up);
 
-       if (port->sysrq)
+       if (port->sysrq || oops_in_progress)
                locked = 0;
-       else if (oops_in_progress)
+       else if (in_kdb_printk())
                locked = spin_trylock_irqsave(&port->lock, flags);
        else
                spin_lock_irqsave(&port->lock, flags);