[kernel] r5972 - in dists/trunk/arch/mips: linux-patch-2.6.15-mips-2.6.15/debian/patches linux-patch-2.6.16-mips-2.6.16/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Mon Feb 27 11:04:19 2006
New Revision: 5972

Added:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/70_ip22zilog_oops.dpatch
   dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/70_ip22zilog_oops.dpatch
Modified:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list
   dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/00list
Log:
fix IP22 serial oops


Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/00list	Mon Feb 27 11:04:19 2006
@@ -35,3 +35,4 @@
 67_check_nonzero_funpoint.dpatch
 68_fix_iomap_nonpci.dpatch
 69_add_mips3.dpatch
+70_ip22zilog_oops.dpatch

Added: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/70_ip22zilog_oops.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/70_ip22zilog_oops.dpatch	Mon Feb 27 11:04:19 2006
@@ -0,0 +1,24 @@
+[serial] ip22zilog: Fix oops on runlevel change with serial console
+
+Incorrect uart_write_wakeup() calls cause reference to a NULL tty
+pointer.  This has been fixed in the sunsab and sunzilog serial drivers
+in October 2005.  Update the ip22zilog, which is based on sunzilog,
+accordingly.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+
+--- a/drivers/serial/ip22zilog.c	2006-02-23 22:05:49.000000000 +0000
++++ b/drivers/serial/ip22zilog.c	2006-02-27 09:51:38.000000000 +0000
+@@ -420,10 +420,8 @@
+ 	if (up->port.info == NULL)
+ 		goto ack_tx_int;
+ 	xmit = &up->port.info->xmit;
+-	if (uart_circ_empty(xmit)) {
+-		uart_write_wakeup(&up->port);
++	if (uart_circ_empty(xmit))
+ 		goto ack_tx_int;
+-	}
+ 	if (uart_tx_stopped(&up->port))
+ 		goto ack_tx_int;
+ 

Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/00list
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/00list	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/00list	Mon Feb 27 11:04:19 2006
@@ -14,3 +14,4 @@
 51_iomap.dpatch
 52_fix_iomap_nonpci.dpatch
 65_fix_gcc4_opt.dpatch
+70_ip22zilog_oops.dpatch

Added: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/70_ip22zilog_oops.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/70_ip22zilog_oops.dpatch	Mon Feb 27 11:04:19 2006
@@ -0,0 +1,24 @@
+[serial] ip22zilog: Fix oops on runlevel change with serial console
+
+Incorrect uart_write_wakeup() calls cause reference to a NULL tty
+pointer.  This has been fixed in the sunsab and sunzilog serial drivers
+in October 2005.  Update the ip22zilog, which is based on sunzilog,
+accordingly.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+
+--- a/drivers/serial/ip22zilog.c	2006-02-23 22:05:49.000000000 +0000
++++ b/drivers/serial/ip22zilog.c	2006-02-27 09:51:38.000000000 +0000
+@@ -420,10 +420,8 @@
+ 	if (up->port.info == NULL)
+ 		goto ack_tx_int;
+ 	xmit = &up->port.info->xmit;
+-	if (uart_circ_empty(xmit)) {
+-		uart_write_wakeup(&up->port);
++	if (uart_circ_empty(xmit))
+ 		goto ack_tx_int;
+-	}
+ 	if (uart_tx_stopped(&up->port))
+ 		goto ack_tx_int;
+