summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250/8250_fsl.c
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2018-10-30 15:11:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-09 09:07:18 -0800
commit596f63da42b92863b40ea4eb29c5b40bfa3e0ef5 (patch)
treee906d45291a9883a5e8bc4690b34503cf97eb8ea /drivers/tty/serial/8250/8250_fsl.c
parent3e6f88068314ffdba61a19f48ab0118f50424348 (diff)
downloadtalos-obmc-linux-596f63da42b92863b40ea4eb29c5b40bfa3e0ef5.tar.gz
talos-obmc-linux-596f63da42b92863b40ea4eb29c5b40bfa3e0ef5.zip
serial: 8250: Process sysrq at port unlock time
Let's take advantage of the new ("serial: core: Allow processing sysrq at port unlock time") to handle sysrqs more cleanly. Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250/8250_fsl.c')
-rw-r--r--drivers/tty/serial/8250/8250_fsl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index 6640a4c7ddd1..ff3dcaea5d93 100644
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
@@ -1,4 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
+#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
#include <linux/serial_reg.h>
#include <linux/serial_8250.h>
@@ -54,7 +58,7 @@ int fsl8250_handle_irq(struct uart_port *port)
serial8250_tx_chars(up);
up->lsr_saved_flags = orig_lsr;
- spin_unlock_irqrestore(&up->port.lock, flags);
+ uart_unlock_and_check_sysrq(&up->port, flags);
return 1;
}
EXPORT_SYMBOL_GPL(fsl8250_handle_irq);
OpenPOWER on IntegriCloud