From: Liang Li <liang.li@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-serial@vger.kernel.org>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: Tree for Jan 23 (pch_uart.c)
Date: Thu, 24 Jan 2013 10:30:54 +0800 [thread overview]
Message-ID: <20130124023054.GA21851@localhost> (raw)
In-Reply-To: <20130124130616.ee95e032326b1afee6716419@canb.auug.org.au>
On 2013-01-24 10:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Wed, 23 Jan 2013 15:28:38 -0800 Randy Dunlap <rdunlap@infradead.org> wrote:
> >
> > on i386:
> >
> > CC [M] drivers/tty/serial/pch_uart.o
> > drivers/tty/serial/pch_uart.c: In function 'pch_uart_hal_read':
> > drivers/tty/serial/pch_uart.c:572:11: error: 'struct uart_port' has no member named 'sysrq'
> > make[4]: *** [drivers/tty/serial/pch_uart.o] Error 1
> >
> >
> >
> > when SERIAL_PCH_UART_CONSOLE is not enabled.
>
Seems so .. but I have SERIAL_PCH_UART_CONSOLE and MAGIC_SYSRQ off
both .. then still has no issue on my side. So I guess that is because
I have CONFIG_SERIAL_CORE_CONSOLE then it works here:
#if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(SUPPORT_SYSRQ)
unsigned long sysrq; /* sysrq timeout */
#endif
In serial_core.h.
> Caused by commit 1f9db0921f21 ("pch_uart: add sysrq support") from the
> tty tree. (added cc's)
>
Sorry, I think we need the below fix to work with
'CONFIG_SERIAL_CORE_CONSOLE is not set' && 'PCH_UART_CONSOLE is not
set' case:
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index c5ee7d45..4771aac 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -573,10 +573,12 @@ static int pch_uart_hal_read(struct eg20t_port *priv, unsigned char *buf,
if (uart_handle_break(port))
continue;
}
+#ifdef SUPPORT_SYSRQ
if (port->sysrq) {
if (uart_handle_sysrq_char(port, rbr))
continue;
}
+#endif
buf[i++] = rbr;
}
---
Should I add a fix for the compile error .. or do squash then send out
refreshed patch ?
Best regards,
Liang Li
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
next prev parent reply other threads:[~2013-01-24 2:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 6:43 linux-next: Tree for Jan 23 Stephen Rothwell
2013-01-23 22:18 ` Stephen Rothwell
2013-01-23 23:10 ` linux-next: Tree for Jan 23 (mtd/ubi and iio and crypto/crc32[c]) Randy Dunlap
2013-01-23 23:23 ` Herbert Xu
2013-01-23 23:41 ` Randy Dunlap
2013-01-26 10:02 ` Jonathan Cameron
2013-01-23 23:28 ` linux-next: Tree for Jan 23 (pch_uart.c) Randy Dunlap
2013-01-24 2:06 ` Stephen Rothwell
2013-01-24 2:30 ` Liang Li [this message]
2013-01-24 4:15 ` Stephen Rothwell
2013-01-24 4:25 ` Liang Li
2013-01-23 23:56 ` linux-next: Tree for Jan 23 (hvc and virtio_console) Randy Dunlap
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=20130124023054.GA21851@localhost \
--to=liang.li@windriver.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
/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).