struct uart_port only has a sysrq member if SERIAL_CORE_CONSOLE is defined, so
don't try to use it if it isn't (e.g. if using allmodconfig).
CC [M] drivers/serial/mux.o
In file included from drivers/serial/mux.c:37:
include/linux/serial_core.h: In function ‘uart_handle_sysrq_char’:
include/linux/serial_core.h:438: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:439: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:439: warning: type defaults to ‘int’ in declaration of ‘__dummy2’
include/linux/serial_core.h:439: warning: comparison of distinct pointer types lacks a cast
include/linux/serial_core.h:439: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:441: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:444: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h: In function ‘uart_handle_break’:
include/linux/serial_core.h:461: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:462: error: ‘struct uart_port’ has no member named ‘sysrq’
include/linux/serial_core.h:465: error: ‘struct uart_port’ has no member named ‘sysrq’
Signed-off-by: Frank Lichtenheld <frank@xxxxxxxxxxxxxx>
---
include/linux/serial_core.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 6a5203f..e2233a8 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -434,7 +434,7 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
static inline int
uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
{
-#ifdef SUPPORT_SYSRQ
+#if defined(SUPPORT_SYSRQ) && defined(CONFIG_SERIAL_CORE_CONSOLE)
if (port->sysrq) {
if (ch && time_before(jiffies, port->sysrq)) {
handle_sysrq(ch, port->info->tty);
@@ -456,7 +456,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
static inline int uart_handle_break(struct uart_port *port)
{
struct uart_info *info = port->info;
-#ifdef SUPPORT_SYSRQ
+#if defined(SUPPORT_SYSRQ) && defined(CONFIG_SERIAL_CORE_CONSOLE)
if (port->cons && port->cons->index == port->line) {
if (!port->sysrq) {
port->sysrq = jiffies + HZ*5;
--
1.5.3.4
-
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
