Only two `h' in threshold.

7 files changed, 23 insertions, 24 deletions

diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index d1da7ee591e..6b2258a068a 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.33 2005/11/15 07:02:36 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.34 2005/11/15 21:09:44 miod Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -1036,7 +1036,7 @@ hderror(unit)
 	}
 	/*
 	 * Only report error if we have reached the error reporting
-	 * threshhold.  By default, this will only report after the
+	 * threshold.  By default, this will only report after the
 	 * retry limit has been exceeded.
 	 */
 	if (rs->sc_tab.b_errcnt < hderrthresh)
diff --git a/sys/arch/m68k/fpsp/round.sa b/sys/arch/m68k/fpsp/round.sa
index 792fdf5f0ca..f46ad90f2ea 100644
--- a/sys/arch/m68k/fpsp/round.sa
+++ b/sys/arch/m68k/fpsp/round.sa
@@ -1,4 +1,4 @@
-*	$OpenBSD: round.sa,v 1.2 1996/05/29 21:05:33 niklas Exp $
+*	$OpenBSD: round.sa,v 1.3 2005/11/15 21:09:45 miod Exp $
 *	$NetBSD: round.sa,v 1.3 1994/10/26 07:49:24 cgd Exp $
 
 *	MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
@@ -508,7 +508,7 @@ no_inex:
 	rts
 
 *
-*	dnrm_lp --- normalize exponent/mantissa to specified threshhold
+*	dnrm_lp --- normalize exponent/mantissa to specified threshold
 *
 * Input:
 *	a0		points to the operand to be denormalized
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 174aa1333d3..c95c45db243 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.192 2005/11/02 22:17:20 markus Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.193 2005/11/15 21:09:45 miod Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -1588,7 +1588,7 @@ trimthenstep6:
 				 * duplicate ack (ie, window info didn't
 				 * change), the ack is the biggest we've
 				 * seen and we've seen exactly our rexmt
-				 * threshhold of them, assume a packet
+				 * threshold of them, assume a packet
 				 * has been dropped and retransmit it.
 				 * Kludge snd_nxt & the congestion
 				 * window so we send only this one
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index d8b603617e8..7265e503970 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.c,v 1.37 2005/06/30 08:51:31 markus Exp $	*/
+/*	$OpenBSD: tcp_timer.c,v 1.38 2005/11/15 21:09:46 miod Exp $	*/
 /*	$NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $	*/
 
 /*
@@ -354,12 +354,12 @@ tcp_timer_rexmt(void *arg)
 	 * almost immediately.  To get more time between
 	 * drops but still "push" the network to take advantage
 	 * of improving conditions, we switch from exponential
-	 * to linear window opening at some threshhold size.
-	 * For a threshhold, we use half the current window
+	 * to linear window opening at some threshold size.
+	 * For a threshold, we use half the current window
 	 * size, truncated to a multiple of the mss.
 	 *
 	 * (the minimum cwnd that will give us exponential
-	 * growth is 2 mss.  We don't allow the threshhold
+	 * growth is 2 mss.  We don't allow the threshold
 	 * to go below this.)
 	 */
 	{
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 85117aa15f3..f0d6d974cfc 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.77 2005/08/02 11:05:44 markus Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.78 2005/11/15 21:09:46 miod Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -148,7 +148,7 @@ struct tcpcb {
 					 */
 /* congestion control (for slow start, source quench, retransmit after loss) */
 	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshhold for
+	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
 					 * for slow start exponential to
 					 * linear switch
 					 */
diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c
index 8ed1e7ca754..5e93c60caf9 100644
--- a/sys/ufs/lfs/lfs_bio.c
+++ b/sys/ufs/lfs/lfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_bio.c,v 1.11 2004/06/21 23:50:38 tholo Exp $	*/
+/*	$OpenBSD: lfs_bio.c,v 1.12 2005/11/15 21:09:46 miod Exp $	*/
 /*	$NetBSD: lfs_bio.c,v 1.5 1996/02/09 22:28:49 christos Exp $	*/
 
 /*
@@ -62,11 +62,11 @@ int	locked_queue_count;		/* XXX Count of locked-down buffers. */
 int	lfs_writing;			/* Set if already kicked off a writer
 					   because of buffer space */
 /*
-#define WRITE_THRESHHOLD	((nbuf >> 2) - 10)
-#define WAIT_THRESHHOLD		((nbuf >> 1) - 10)
+#define WRITE_THRESHOLD		((nbuf >> 2) - 10)
+#define WAIT_THRESHOLD		((nbuf >> 1) - 10)
 */
-#define WAIT_THRESHHOLD         (nbuf - (nbuf >> 2) - 10)
-#define WRITE_THRESHHOLD        ((nbuf >> 1) - 10)
+#define WAIT_THRESHOLD          (nbuf - (nbuf >> 2) - 10)
+#define WRITE_THRESHOLD         ((nbuf >> 1) - 10)
 #define LFS_BUFWAIT	2
 
 struct timeout wakeup_timeout;
@@ -122,7 +122,7 @@ lfs_bwrite(v)
 		TAILQ_INSERT_TAIL(&bdirties, bp, b_synclist);
 		bp->b_synctime = time_second + 30;
 		s = splbio();
-		if (bdirties.tqh_first == bp) {
+		if (TAILQ_FIRST(&bdirties) == bp) {
 			if (timeout_triggered(&wakeup_timeout))
 				timeout_del(&wakeup_timeout);
 			if (!timeout_initialized(&wakeup_timeout))
@@ -156,8 +156,7 @@ lfs_flush()
 	if (lfs_writing)
 		return;
 	lfs_writing = 1;
-	for (mp = mountlist.cqh_first; mp != (void *)&mountlist;
-	     mp = mp->mnt_list.cqe_next) {
+	CIRCLEQ_FOREACH(mp, &mountlist, mnt_list) {
 		/* The lock check below is to avoid races with unmount. */
 		if (!strncmp(&mp->mnt_stat.f_fstypename[0], MOUNT_LFS, MFSNAMELEN) &&
 		    (mp->mnt_flag & (MNT_RDONLY)) == 0 &&
@@ -188,11 +187,11 @@ lfs_check(vp, blkno)
 	error = 0;
 	if (incore(vp, blkno))
 		return (0);
-	if (locked_queue_count > WRITE_THRESHHOLD)
+	if (locked_queue_count > WRITE_THRESHOLD)
 		lfs_flush();
 
 	/* If out of buffers, wait on writer */
-	while (locked_queue_count > WAIT_THRESHHOLD) {
+	while (locked_queue_count > WAIT_THRESHOLD) {
 #ifdef DOSTATS
 	    ++lfs_stats.wait_exceeded;
 #endif
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index be72e9abae6..0208e2b3b53 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_aobj.c,v 1.28 2005/10/27 18:05:16 otto Exp $	*/
+/*	$OpenBSD: uvm_aobj.c,v 1.29 2005/11/15 21:09:46 miod Exp $	*/
 /*	$NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -94,7 +94,7 @@
 			    & (AOBJ)->u_swhashmask)])
 
 /*
- * the swhash threshhold determines if we will use an array or a
+ * the swhash threshold determines if we will use an array or a
  * hash table to store the list of allocated swap blocks.
  */