diff options
| author |   Dmitry Safonov <dima@arista.com> | 2019-12-13 00:06:53 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-18 15:05:11 +0100 |
| commit | 82cfd2e62b354840af6a045e084f6e9e7c49584d (patch) | |
| tree | 38380dc87729849c66373f3638ab88fec7f22524 /include/linux/serial_core.h | |
| parent | tty/serial: Migrate zs to use has_sysrq (diff) | |
| download | wireguard-linux-82cfd2e62b354840af6a045e084f6e9e7c49584d.tar.xz wireguard-linux-82cfd2e62b354840af6a045e084f6e9e7c49584d.zip | |
serial_core: Remove SUPPORT_SYSRQ ifdeffery
No one defines it anymore.
Signed-off-by: Dmitry Safonov <dima@arista.com>
Link: https://lore.kernel.org/r/20191213000657.931618-55-dima@arista.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5f761c399282..9cf1682dc580 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -466,10 +466,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL)) return 0; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) - return 0; - - if (!port->sysrq) + if (!port->has_sysrq || !port->sysrq) return 0; if (ch && time_before(jiffies, port->sysrq)) { @@ -487,10 +484,7 @@ uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch) if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL)) return 0; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) - return 0; - - if (!port->sysrq) + if (!port->has_sysrq || !port->sysrq) return 0; if (ch && time_before(jiffies, port->sysrq)) { @@ -507,7 +501,7 @@ uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long irqflags) { int sysrq_ch; - if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) { + if (!port->has_sysrq) { spin_unlock_irqrestore(&port->lock, irqflags); return; } @@ -531,7 +525,7 @@ static inline int uart_handle_break(struct uart_port *port) if (port->handle_break) port->handle_break(port); - if (port->has_sysrq || IS_ENABLED(SUPPORT_SYSRQ)) { + if (port->has_sysrq) { if (port->cons && port->cons->index == port->line) { if (!port->sysrq) { port->sysrq = jiffies + HZ*5; |