* Re: linux-next: Tree for Jan 23 (pch_uart.c)
[not found] <20130123174336.47c0113740a14da7f6a92187@canb.auug.org.au>
@ 2013-01-23 23:28 ` Randy Dunlap
2013-01-24 2:06 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2013-01-23 23:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, linux-serial
On 01/22/13 22:43, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20130122:
>
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.
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Jan 23 (pch_uart.c)
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
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-01-24 2:06 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-next, linux-kernel, linux-serial, Greg KH, Liang Li
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
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.
Caused by commit 1f9db0921f21 ("pch_uart: add sysrq support") from the
tty tree. (added cc's)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Jan 23 (pch_uart.c)
2013-01-24 2:06 ` Stephen Rothwell
@ 2013-01-24 2:30 ` Liang Li
2013-01-24 4:15 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Liang Li @ 2013-01-24 2:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Randy Dunlap, linux-next, linux-kernel, linux-serial, Greg KH
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Jan 23 (pch_uart.c)
2013-01-24 2:30 ` Liang Li
@ 2013-01-24 4:15 ` Stephen Rothwell
2013-01-24 4:25 ` Liang Li
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-01-24 4:15 UTC (permalink / raw)
To: Liang Li; +Cc: Randy Dunlap, linux-next, linux-kernel, linux-serial, Greg KH
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
Hi,
On Thu, 24 Jan 2013 10:30:54 +0800 Liang Li <liang.li@windriver.com> wrote:
>
> Should I add a fix for the compile error .. or do squash then send out
> refreshed patch ?
You need to send a fix patch to Greg based on his tty tree
(git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: Tree for Jan 23 (pch_uart.c)
2013-01-24 4:15 ` Stephen Rothwell
@ 2013-01-24 4:25 ` Liang Li
0 siblings, 0 replies; 5+ messages in thread
From: Liang Li @ 2013-01-24 4:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Randy Dunlap, linux-next, linux-kernel, linux-serial, Greg KH
On 2013-01-24 12:15, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi,
>
> On Thu, 24 Jan 2013 10:30:54 +0800 Liang Li <liang.li@windriver.com> wrote:
> >
> > Should I add a fix for the compile error .. or do squash then send out
> > refreshed patch ?
>
> You need to send a fix patch to Greg based on his tty tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git).
>
Ok, got it. Will keep you and Randy CC'd.
Thanks,
Liang Li
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-24 4:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130123174336.47c0113740a14da7f6a92187@canb.auug.org.au>
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
2013-01-24 4:15 ` Stephen Rothwell
2013-01-24 4:25 ` Liang Li
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).