tty: xuartps: Properly guard sysrq specific code

sorenb-xlnx · gregkh · commit c2db11eca089 · 2013-12-17T16:02:25.000-08:00
Commit 'tty: xuartps: Implement BREAK detection, add SYSRQ support' (0c0c47b) 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: Masanari Iida <standby24x7@gmail.com> Cc: Vlad Lungu <vlad.lungu@windriver.com> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
@@ -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++;
 

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)`
`240`	`240`	`continue;`
`241`	`241`	`}`
`242`	`242`
	`243`	`+#ifdef SUPPORT_SYSRQ`
`243`	`244`	`/*`
`244`	`245`	`* uart_handle_sysrq_char() doesn't work if`
`245`	`246`	`* spinlocked, for some reason`
`@@ -253,6 +254,7 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)`
`253`	`254`	`}`
`254`	`255`	`spin_lock(&port->lock);`
`255`	`256`	`}`
	`257`	`+#endif`
`256`	`258`
`257`	`259`	`port->icount.rx++;`
`258`	`260`