mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
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>
This commit is contained in:
parent
45896c7e6e
commit
82cfd2e62b
1 changed files with 4 additions and 10 deletions
|
@ -466,10 +466,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
|
||||||
if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL))
|
if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ))
|
if (!port->has_sysrq || !port->sysrq)
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!port->sysrq)
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (ch && time_before(jiffies, port->sysrq)) {
|
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))
|
if (!IS_ENABLED(CONFIG_MAGIC_SYSRQ_SERIAL))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ))
|
if (!port->has_sysrq || !port->sysrq)
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!port->sysrq)
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (ch && time_before(jiffies, port->sysrq)) {
|
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;
|
int sysrq_ch;
|
||||||
|
|
||||||
if (!port->has_sysrq && !IS_ENABLED(SUPPORT_SYSRQ)) {
|
if (!port->has_sysrq) {
|
||||||
spin_unlock_irqrestore(&port->lock, irqflags);
|
spin_unlock_irqrestore(&port->lock, irqflags);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -531,7 +525,7 @@ static inline int uart_handle_break(struct uart_port *port)
|
||||||
if (port->handle_break)
|
if (port->handle_break)
|
||||||
port->handle_break(port);
|
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->cons && port->cons->index == port->line) {
|
||||||
if (!port->sysrq) {
|
if (!port->sysrq) {
|
||||||
port->sysrq = jiffies + HZ*5;
|
port->sysrq = jiffies + HZ*5;
|
||||||
|
|
Loading…
Reference in a new issue