[kernel] r6975 - in dists/trunk/linux-2.6/debian: . patches/series

[Thiemo Seufer]

Author: ths
Date: Sun Jul  9 19:46:38 2006
New Revision: 6975

Added:
   dists/trunk/linux-2.6/debian/patches/mips-ip22-serial-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/3

Log:
  * [mips] Fix SGI ip22 serial console, thanks to Julien Blache.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jul  9 19:46:38 2006
@@ -54,6 +54,7 @@
   * [mips,mipsel] Fix sb1 interrupt handlers.
   * [mips,mipsel] Fix devfs-induced build failure in sb1250 serial driver.
   * [mips] SGI ip22 RTC was broken, fixed thanks to Julien Blache.
+  * [mips] Fix SGI ip22 serial console, thanks to Julien Blache.
 
  -- dann frazier <dannf at debian.org>  Sat,  8 Jul 2006 21:31:04 -0600
 

Added: dists/trunk/linux-2.6/debian/patches/mips-ip22-serial-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/mips-ip22-serial-fix.patch	Sun Jul  9 19:46:38 2006
@@ -0,0 +1,21 @@
+The patch below fixes serial console hangs as seen on IP22
+machines. Typically, while booting, the machine hangs for ~1 minute
+displaying "INIT: ", then the same thing happens again when init
+enters in the designated runlevel and finally the getty process on
+ttyS0 hangs indefinitely (though strace'ing it helps).
+
+Signed-off-by: Julien BLACHE <jb at jblache.org>
+
+--- source-mips-none/drivers/serial/ip22zilog.c	2006-06-18 03:49:35.000000000 +0200
++++ source/drivers/serial/ip22zilog.c	2006-07-09 14:25:11.847260358 +0200
+@@ -1145,9 +1145,8 @@
+ 		up[(chip * 2) + 1].port.fifosize = 1;
+ 		up[(chip * 2) + 1].port.ops = &ip22zilog_pops;
+ 		up[(chip * 2) + 1].port.type = PORT_IP22ZILOG;
+-		up[(chip * 2) + 1].port.flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
+ 		up[(chip * 2) + 1].port.line = (chip * 2) + 1;
+-		up[(chip * 2) + 1].flags = 0;
++		up[(chip * 2) + 1].flags |= IP22ZILOG_FLAG_IS_CHANNEL_A;
+ 	}
+ }
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/3	Sun Jul  9 19:46:38 2006
@@ -7,3 +7,4 @@
 + mips-sb1-inthandler.patch
 + mips-bcm1480-inthandler-typo.patch
 + mips-sb1250-duart.patch
++ mips-ip22-serial-fix.patch