diff options
| author | ache <ache@FreeBSD.org> | 1995-05-07 23:53:36 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-05-07 23:53:36 +0000 |
| commit | e788121172d68a77694232e6a216eb96cb57f648 (patch) | |
| tree | c5e5babc97473f0785ba421a2dd45fcfb261818c | |
| parent | 01c872638ff0b1ecd62eb5b6f8af71dfd05ae205 (diff) | |
| download | FreeBSD-src-e788121172d68a77694232e6a216eb96cb57f648.zip FreeBSD-src-e788121172d68a77694232e6a216eb96cb57f648.tar.gz | |
Make two "ttyout" ttysleep wmesg unique
Add t_timeout to ttysleep call into ttywrite
| -rw-r--r-- | sys/kern/tty.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 11c0a3f..66fec9e 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.42 1995/04/15 21:04:58 bde Exp $ + * $Id: tty.c,v 1.43 1995/05/07 06:32:28 bde Exp $ */ #include "snp.h" @@ -1042,7 +1042,7 @@ ttywait(tp) (ISSET(tp->t_state, TS_CARR_ON) || ISSET(tp->t_cflag, CLOCAL))) { SET(tp->t_state, TS_ASLEEP); error = ttysleep(tp, &tp->t_outq, TTOPRI | PCATCH, - ttyout, tp->t_timeout); + "ttywai", tp->t_timeout); if (error) break; } @@ -1812,7 +1812,8 @@ ovhiwat: return (uio->uio_resid == cnt ? EWOULDBLOCK : 0); } SET(tp->t_state, TS_ASLEEP); - error = ttysleep(tp, &tp->t_outq, TTOPRI | PCATCH, ttyout, 0); + error = ttysleep(tp, &tp->t_outq, TTOPRI | PCATCH, "ttywri", + tp->t_timeout); splx(s); if (error) goto out; |
