- Updated to 3.3-rc4.

[linux-flexiantxendom0-3.2.10.git] / drivers / tty / serial / 8250 / 8250.c

diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 9b7336f..3f82bbb 100644 (file)
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -100,6 +100,8 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */
 #define CONFIG_SERIAL_MANY_PORTS 1
 #endif
 
+#define arch_8250_sysrq_via_ctrl_o(a,b) 0
+
 /*
  * HUB6 is always on.  This will be removed once the header
  * files have been cleaned.
@@ -1388,7 +1390,11 @@ serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
 
        do {
                if (likely(lsr & UART_LSR_DR))
+               {
                        ch = serial_inp(up, UART_RX);
+                       if (arch_8250_sysrq_via_ctrl_o(ch, &up->port))
+                               goto ignore_char;
+               }
                else
                        /*
                         * Intel 82571 has a Serial Over Lan device that will