From: Mark Brown <broonie@kernel.org>
To: Soren Brinkmann <soren.brinkmann@xilinx.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org, linaro-kernel@lists.linaro.org,
Mark Brown <broonie@linaro.org>
Subject: [PATCH] tty: xuartps: Fix build when SYSRQ is disabled
Date: Tue, 17 Dec 2013 23:27:38 +0000 [thread overview]
Message-ID: <1387322858-5111-1-git-send-email-broonie@kernel.org> (raw)
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
next reply other threads:[~2013-12-17 23:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 23:27 Mark Brown [this message]
2013-12-17 23:47 ` [PATCH] tty: xuartps: Fix build when SYSRQ is disabled Greg Kroah-Hartman
2013-12-17 23:53 ` Sören Brinkmann
2013-12-18 0:01 ` Greg Kroah-Hartman
2013-12-18 0:02 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387322858-5111-1-git-send-email-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=broonie@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-serial@vger.kernel.org \
--cc=soren.brinkmann@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).