From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [PATCH] serial: pch_uart: fix sysrq handling for pch_uart Date: Thu, 24 Jan 2013 16:07:48 -0800 Message-ID: <5101CCD4.6020205@infradead.org> References: <1359001887-1016-1-git-send-email-liang.li@windriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from casper.infradead.org ([85.118.1.10]:41840 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754597Ab3AYAGs (ORCPT ); Thu, 24 Jan 2013 19:06:48 -0500 In-Reply-To: <1359001887-1016-1-git-send-email-liang.li@windriver.com> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: Liang Li Cc: gregkh@linuxfoundation.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, sfr@canb.auug.org.au, linux-next@vger.kernel.org On 01/23/13 20:31, Liang Li wrote: > When PCH_UART_CONSOLE and SERIAL_CORE_CONSOLE is not set neither, the > uart_port will have no 'sysrq' member hence their will need a '#ifdef' > in pch_uart.c to handle the case, otherwise we'll see compile error > like this: > > 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 > > Reported-by: Randy Dunlap > CC: Stephen Rothwell > Signed-off-by: Liang Li Acked-by: Randy Dunlap Thanks. > --- > Hi Greg, > > This is for 'tty-next' of your tty tree. Thanks. > > drivers/tty/serial/pch_uart.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c > index 1ddfc66..7a6c989 100644 > --- a/drivers/tty/serial/pch_uart.c > +++ b/drivers/tty/serial/pch_uart.c > @@ -569,10 +569,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; > } > -- ~Randy