Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2db11ec authored by Soren Brinkmann's avatar Soren Brinkmann Committed by Greg Kroah-Hartman
Browse files

tty: xuartps: Properly guard sysrq specific code 



Commit 'tty: xuartps: Implement BREAK detection, add SYSRQ support'
(0c0c47bc) introduced sysrq support
without properly guarding sysrq specific code which results in build
errors when sysrq is disabled:
	DNAME=KBUILD_STR(xilinx_uartps)" -c -o
	drivers/tty/serial/.tmp_xilinx_uartps.o
	drivers/tty/serial/xilinx_uartps.c
	drivers/tty/serial/xilinx_uartps.c: In function 'xuartps_isr':
	drivers/tty/serial/xilinx_uartps.c:247:5: error: 'struct uart_port'
	has no member named 'sysrq'
	drivers/tty/serial/xilinx_uartps.c:247:5: error: 'struct uart_port'
	has no member named 'sysrq'
	drivers/tty/serial/xilinx_uartps.c:247:5: error: 'struct uart_port'
	has no member named 'sysrq'
	make[3]: *** [drivers/tty/serial/xilinx_uartps.o] Error 1

Reported-by: default avatarMasanari Iida <standby24x7@gmail.com>
Cc: Vlad Lungu <vlad.lungu@windriver.com>
Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1075a6e2

drivers/tty/serial/xilinx_uartps.c

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id) 
					continue;

			}



#ifdef SUPPORT_SYSRQ

			/*

			 * uart_handle_sysrq_char() doesn't work if

			 * spinlocked, for some reason
@@ -253,6 +254,7 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id) 
				}

				spin_lock(&port->lock);

			}

#endif



			port->icount.rx++;