r1997 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: 2004-12-14 19:50:35 -0700 (Tue, 14 Dec 2004)
New Revision: 1997

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/115_tty_lockup-3.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7
Log:
fix an unterminated comment introduced by the tty fixes

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-12-14 04:31:46 UTC (rev 1996)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-12-15 02:50:35 UTC (rev 1997)
@@ -4,8 +4,9 @@
     could lead to elevated previleges (CAN-2004-1068) (dann frazier)
   * Security: Fix a potential oops using a malformed a.out binary
     (CAN-2004-1074) (dann frazier)
+  * 115_tty_lockup-3.diff: Fix an unterminated comment (dann frazier)
 
- -- dann frazier <dannf@debian.org>  Mon, 13 Dec 2004 21:07:48 -0700
+ -- dann frazier <dannf@debian.org>  Tue, 14 Dec 2004 19:48:29 -0700
 
 kernel-source-2.4.27 (2.4.27-6) unstable; urgency=low
 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/115_tty_lockup-3.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/115_tty_lockup-3.diff	2004-12-14 04:31:46 UTC (rev 1996)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/115_tty_lockup-3.diff	2004-12-15 02:50:35 UTC (rev 1997)
@@ -0,0 +1,18 @@
+# origin: dann frazier <dannf@debian.org>
+# cset: n/a
+# inclusion: missing comment text backported from 2.6 bitkeeper
+# revision date: 2004-12-14
+# description: Fix unterminated comment
+diff -urN kernel-source-2.4.27.orig/drivers/char/tty_io.c kernel-source-2.4.27/drivers/char/tty_io.c
+--- kernel-source-2.4.27.orig/drivers/char/tty_io.c	2004-12-01 03:07:57.000000000 -0700
++++ kernel-source-2.4.27/drivers/char/tty_io.c	2004-12-14 19:32:06.886350385 -0700
+@@ -767,6 +767,9 @@
+ 	/* Defer ldisc switch */
+ 	/* tty_deferred_ldisc_switch(N_TTY);
+ 
++	  This should get done automatically when the port closes and
++	  tty_release is called */
++
+ 	read_lock(&tasklist_lock);
+  	for_each_task(p) {
+ 		if ((tty->session > 0) && (p->session == tty->session) &&

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7	2004-12-14 04:31:46 UTC (rev 1996)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-7	2004-12-15 02:50:35 UTC (rev 1997)
@@ -1,2 +1,3 @@
 + 113-unix-serialization.diff
 + 114-binfmt_aout-CAN-2004-1074.diff
++ 115_tty_lockup-3.diff