[PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[Mark Brown]

From: Mark Brown <broonie@linaro.org>

The sysrq field in struct uart_port is only defined when
SERIAL_CORE_CONSOLE or SUPPORT_SYSRQ are selected but the driver uses
the field unconditionally, causing build failures if they aren't (as
happens when doing an arm64 allmodconfig).  Make the usage conditional
as well.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 drivers/tty/serial/xilinx_uartps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index e46e9f3f19b9..17de38064b2a 100644
--- 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;
 			}
 
+#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(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++;
 
-- 
1.8.5.1

Re: [PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[Greg Kroah-Hartman]

On Tue, Dec 17, 2013 at 11:27:38PM +0000, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
> 
> The sysrq field in struct uart_port is only defined when
> SERIAL_CORE_CONSOLE or SUPPORT_SYSRQ are selected but the driver uses
> the field unconditionally, causing build failures if they aren't (as
> happens when doing an arm64 allmodconfig).  Make the usage conditional
> as well.
> 
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
>  drivers/tty/serial/xilinx_uartps.c | 2 ++
>  1 file changed, 2 insertions(+)

Is this a 3.13-final fix, or can it wait for 3.14?

thanks,

greg k-h

Re: [PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[Sören Brinkmann]

Hi Greg, Mark,

On Tue, Dec 17, 2013 at 03:47:44PM -0800, Greg Kroah-Hartman wrote:
> On Tue, Dec 17, 2013 at 11:27:38PM +0000, Mark Brown wrote:
> > From: Mark Brown <broonie@linaro.org>
> > 
> > The sysrq field in struct uart_port is only defined when
> > SERIAL_CORE_CONSOLE or SUPPORT_SYSRQ are selected but the driver uses
> > the field unconditionally, causing build failures if they aren't (as
> > happens when doing an arm64 allmodconfig).  Make the usage conditional
> > as well.
> > 
> > Signed-off-by: Mark Brown <broonie@linaro.org>
> > ---
> >  drivers/tty/serial/xilinx_uartps.c | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> Is this a 3.13-final fix, or can it wait for 3.14?

I sent out pretty much the same fix a week ago:
https://lkml.org/lkml/2013/12/2/694

It seems to fix a broken build for certain configurations. Hence, I'd
say it's a fix for 3.13.

	Sören


--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[Greg Kroah-Hartman]

On Tue, Dec 17, 2013 at 03:53:14PM -0800, S??ren Brinkmann wrote:
> Hi Greg, Mark,
> 
> On Tue, Dec 17, 2013 at 03:47:44PM -0800, Greg Kroah-Hartman wrote:
> > On Tue, Dec 17, 2013 at 11:27:38PM +0000, Mark Brown wrote:
> > > From: Mark Brown <broonie@linaro.org>
> > > 
> > > The sysrq field in struct uart_port is only defined when
> > > SERIAL_CORE_CONSOLE or SUPPORT_SYSRQ are selected but the driver uses
> > > the field unconditionally, causing build failures if they aren't (as
> > > happens when doing an arm64 allmodconfig).  Make the usage conditional
> > > as well.
> > > 
> > > Signed-off-by: Mark Brown <broonie@linaro.org>
> > > ---
> > >  drivers/tty/serial/xilinx_uartps.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > 
> > Is this a 3.13-final fix, or can it wait for 3.14?
> 
> I sent out pretty much the same fix a week ago:
> https://lkml.org/lkml/2013/12/2/694

ah, sorry, missed that one somehow.  I'll go queue this up...

greg k-h

Re: [PATCH] tty: xuartps: Fix build when SYSRQ is disabled

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 994 bytes --]

On Tue, Dec 17, 2013 at 03:53:14PM -0800, Sören Brinkmann wrote:
> On Tue, Dec 17, 2013 at 03:47:44PM -0800, Greg Kroah-Hartman wrote:
> > On Tue, Dec 17, 2013 at 11:27:38PM +0000, Mark Brown wrote:

> > > The sysrq field in struct uart_port is only defined when
> > > SERIAL_CORE_CONSOLE or SUPPORT_SYSRQ are selected but the driver uses
> > > the field unconditionally, causing build failures if they aren't (as
> > > happens when doing an arm64 allmodconfig).  Make the usage conditional
> > > as well.

> > Is this a 3.13-final fix, or can it wait for 3.14?

> I sent out pretty much the same fix a week ago:
> https://lkml.org/lkml/2013/12/2/694

> It seems to fix a broken build for certain configurations. Hence, I'd
> say it's a fix for 3.13.

Yeah, it's a definite build fail with an obvious fix.  You do have to go
looking for the issue and there's a simple workaround so it's not super
critical but it's definitely -final material until very late in the
cycle.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]