Messages in this thread Patch in this message | | | Subject | [PATCH 1/12] UML - tty fix | Date | Thu, 01 Sep 2005 18:16:49 -0400 | From | 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: - */
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |