[PATCH 1/12] UML - tty fix

[PATCH 1/12] UML - tty fix

[Jeff Dike]

This fixes a build breakage introduced by Alan's tty cleanups.  This should
be tied to that patch if possible.

Signed-off-by: Jeff Dike <jdike@addtoit.com>

Index: linux-2.6.13-mm1/arch/um/drivers/chan_kern.c
===================================================================
--- linux-2.6.13-mm1.orig/arch/um/drivers/chan_kern.c	2005-09-01 15:52:25.000000000 -0400
+++ linux-2.6.13-mm1/arch/um/drivers/chan_kern.c	2005-09-01 15:52:31.000000000 -0400
@@ -161,9 +161,6 @@
 		}
 	}
 
-	if((tty->flip.flag_buf_ptr == NULL) || 
-	   (tty->flip.char_buf_ptr == NULL))
-		return;
 	tty_insert_flip_char(tty, ch, TTY_NORMAL);
 }
 
@@ -542,8 +539,8 @@
 		chan = list_entry(ele, struct chan, list);
 		if(!chan->input || (chan->ops->read == NULL)) continue;
 		do {
-			if((tty != NULL) && 
-			   (tty->flip.count >= TTY_FLIPBUF_SIZE)){
+			if((tty != NULL) &&
+			   !tty_buffer_request_room(tty, 1)){
 				schedule_work(task);
 				goto out;
 			}
@@ -572,14 +569,3 @@
  out:
 	if(tty) tty_flip_buffer_push(tty);
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
 

Re: [PATCH 1/12] UML - tty fix

[Alan Cox]

On Iau, 2005-09-01 at 18:16 -0400, Jeff Dike wrote:
> This fixes a build breakage introduced by Alan's tty cleanups.  This should
> be tied to that patch if possible.
> 
> Signed-off-by: Jeff Dike <jdike@addtoit.com>
> 
> Index: linux-2.6.13-mm1/arch/um/drivers/chan_kern.c
> ===================================================================

Acked-by: Alan Cox <alan@redhat.com>

(and applied to my tty tree for future diff generation)