From 96ea38ce98e64fbfd7b1707828530d12f3b90e6b Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Fri, 25 May 1990 22:17:44 -0800
Subject: [PATCH] update from Mike Hibler at Utah

SCCS-vsn: sys/kern/sysv_shm.c 7.3
SCCS-vsn: sys/kern/tty.c 7.27
---
 usr/src/sys/kern/sysv_shm.c | 4 ++--
 usr/src/sys/kern/tty.c      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c
index 81937e2917..ca6db7efd8 100644
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *
- *	@(#)sysv_shm.c	7.2 (Berkeley) %G%
+ *	@(#)sysv_shm.c	7.3 (Berkeley) %G%
  */
 
 /*
@@ -256,7 +256,7 @@ shmat(ap)
 		return;
 	shp = &shmsegs[uap->shmid % SHMMMNI];
 	if (shp->shm_handle == NULL)
-		panic("shmat NULL ptbl");
+		panic("shmat NULL handle");
 	if (!ipcaccess(&shp->shm_perm,
 		      (uap->shmflg&SHM_RDONLY) ? IPC_R : IPC_R|IPC_W))
 		return;
diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index c2d0a4963e..24bf97816a 100644
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)tty.c	7.26 (Berkeley) %G%
+ *	@(#)tty.c	7.27 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -196,7 +196,7 @@ ttyblock(tp)
 	 * Block further input iff:
 	 * Current input > threshold AND input is available to user program
 	 */
-	if (x >= TTYHOG/2 && 
+	if (x >= TTYHOG/2 && (tp->t_state & TS_TBLOCK) == 0 &&
 	    (!(tp->t_lflag&ICANON)) || (tp->t_canq.c_cc > 0) &&
 	    tp->t_cc[VSTOP] != POSIX_V_DISABLE) {
 		if (putc(tp->t_cc[VSTOP], &tp->t_outq)==0) {
@@ -1759,7 +1759,7 @@ ttyinfo(tp)
 	register char *cp = hostname;
 	int x, s;
 	struct timeval utime, stime;
-#define	pgtok(a)	((a)/(1024/NBPG))
+#define	pgtok(a)	(((a)*NBPG)/1024)
 
 	if (ttycheckoutq(tp,0) == 0) 
 		return;
-- 
2.20.1