{en,re}trys -> {en,re}tries; eyeballed by jmc@

14 files changed, 37 insertions, 37 deletions

diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 8721bf2bebf..5b4fa311f44 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.85 2005/11/18 17:05:04 brad Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.86 2005/12/10 11:45:41 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -360,7 +360,7 @@ static vaddr_t virtual_end;	/* VA of last free KVA */
  */
 
 TAILQ_HEAD(pv_pagelist, pv_page);
-static struct pv_pagelist pv_freepages;	/* list of pv_pages with free entrys */
+static struct pv_pagelist pv_freepages;	/* list of pv_pages with free entries */
 static struct pv_pagelist pv_unusedpgs; /* list of unused pv_pages */
 static int pv_nfpvents;			/* # of free pv entries */
 static struct pv_page *pv_initpage;	/* bootstrap page from kernel_map */
@@ -1340,7 +1340,7 @@ pmap_alloc_pvpage(pmap, mode)
 		goto steal_one;
 
 	/*
-	 * add a mapping for our new pv_page and free its entrys (save one!)
+	 * add a mapping for our new pv_page and free its entries (save one!)
 	 *
 	 * NOTE: If we are allocating a PV page for the kernel pmap, the
 	 * pmap is already locked!  (...but entering the mapping is safe...)
@@ -3265,7 +3265,7 @@ pmap_enter(pmap, va, pa, prot, flags)
 		if (wired)
 			pmap->pm_stats.wired_count++;
 		if (ptp)
-			ptp->wire_count++;      /* count # of valid entrys */
+			ptp->wire_count++;      /* count # of valid entries */
 	}
 
 	/*
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index 28d0f5a62d3..46c9885c635 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.17 2004/10/20 12:49:15 pefo Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.18 2005/12/10 11:45:43 miod Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -170,7 +170,7 @@ pmap_bootstrap()
 	/*
 	 * The 64 bit Mips architecture stores the AND result
 	 * of the Global bits in the pte pair in the on chip
-	 * translation lookaside buffer. Thus invalid entrys
+	 * translation lookaside buffer. Thus invalid entries
 	 * must have the Global bit set so when Entry LO and
 	 * Entry HI G bits are ANDed together they will produce
 	 * a global bit to store in the tlb.
diff --git a/sys/arch/vax/boot/boot/if_de.c b/sys/arch/vax/boot/boot/if_de.c
index b48d816c75f..c4c61acfbc1 100644
--- a/sys/arch/vax/boot/boot/if_de.c
+++ b/sys/arch/vax/boot/boot/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.1 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_de.c,v 1.2 2005/12/10 11:45:43 miod Exp $ */
 /*	$NetBSD: if_de.c,v 1.2 2002/05/24 21:41:40 ragge Exp $	*/
 
 /*
@@ -69,8 +69,8 @@ struct netif_driver de_driver = {
 struct de_cdata {
 	/* the following structures are always mapped in */
         struct  de_pcbb dc_pcbb;        /* port control block */
-        struct  de_ring dc_xrent[NXMT]; /* transmit ring entrys */
-        struct  de_ring dc_rrent[NRCV]; /* receive ring entrys */
+        struct  de_ring dc_xrent[NXMT]; /* transmit ring entries */
+        struct  de_ring dc_rrent[NRCV]; /* receive ring entries */
         struct  de_udbbuf dc_udbbuf;    /* UNIBUS data buffer */
 	char	dc_rbuf[NRCV][ETHER_MAX_LEN];
 	char	dc_xbuf[NXMT][ETHER_MAX_LEN];
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index d4b65f80983..bfbd73839ca 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.17 2005/06/08 17:03:02 henning Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.18 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $	*/
 
 /*
@@ -106,8 +106,8 @@ struct	de_softc {
 	struct	ifxmt ds_ifw[NXMT];	/* unibus xmt maps */
 	/* the following structures are always mapped in */
 	struct	de_pcbb ds_pcbb;	/* port control block */
-	struct	de_ring ds_xrent[NXMT];	/* transmit ring entrys */
-	struct	de_ring ds_rrent[NRCV];	/* receive ring entrys */
+	struct	de_ring ds_xrent[NXMT];	/* transmit ring entries */
+	struct	de_ring ds_rrent[NRCV];	/* receive ring entries */
 	struct	de_udbbuf ds_udbbuf;	/* UNIBUS data buffer */
 	/* end mapped area */
 #define	INCORE_BASE(p)	((char *)&(p)->ds_pcbb)
diff --git a/sys/arch/vax/qbus/if_de.c b/sys/arch/vax/qbus/if_de.c
index 16fb339aed2..2643833992e 100644
--- a/sys/arch/vax/qbus/if_de.c
+++ b/sys/arch/vax/qbus/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.4 2004/07/07 23:10:46 deraadt Exp $ */
+/*	$OpenBSD: if_de.c,v 1.5 2005/12/10 11:45:43 miod Exp $ */
 /*	$NetBSD: if_de.c,v 1.11 2001/11/13 07:11:24 lukem Exp $	*/
 
 /*
@@ -98,8 +98,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.11 2001/11/13 07:11:24 lukem Exp $");
 struct	de_cdata {
 	/* the following structures are always mapped in */
 	struct	de_pcbb dc_pcbb;	/* port control block */
-	struct	de_ring dc_xrent[NXMT]; /* transmit ring entrys */
-	struct	de_ring dc_rrent[NRCV]; /* receive ring entrys */
+	struct	de_ring dc_xrent[NXMT]; /* transmit ring entries */
+	struct	de_ring dc_rrent[NRCV]; /* receive ring entries */
 	struct	de_udbbuf dc_udbbuf;	/* UNIBUS data buffer */
 	/* end mapped area */
 };
diff --git a/sys/arch/vax/stand/boot/if_de.c b/sys/arch/vax/stand/boot/if_de.c
index b48d816c75f..c4c61acfbc1 100644
--- a/sys/arch/vax/stand/boot/if_de.c
+++ b/sys/arch/vax/stand/boot/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.1 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_de.c,v 1.2 2005/12/10 11:45:43 miod Exp $ */
 /*	$NetBSD: if_de.c,v 1.2 2002/05/24 21:41:40 ragge Exp $	*/
 
 /*
@@ -69,8 +69,8 @@ struct netif_driver de_driver = {
 struct de_cdata {
 	/* the following structures are always mapped in */
         struct  de_pcbb dc_pcbb;        /* port control block */
-        struct  de_ring dc_xrent[NXMT]; /* transmit ring entrys */
-        struct  de_ring dc_rrent[NRCV]; /* receive ring entrys */
+        struct  de_ring dc_xrent[NXMT]; /* transmit ring entries */
+        struct  de_ring dc_rrent[NRCV]; /* receive ring entries */
         struct  de_udbbuf dc_udbbuf;    /* UNIBUS data buffer */
 	char	dc_rbuf[NRCV][ETHER_MAX_LEN];
 	char	dc_xbuf[NXMT][ETHER_MAX_LEN];
diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c
index d0ee49b5cc2..63a21c47fd4 100644
--- a/sys/compat/ultrix/ultrix_fs.c
+++ b/sys/compat/ultrix/ultrix_fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_fs.c,v 1.12 2004/06/22 23:52:18 jfb Exp $	*/
+/*	$OpenBSD: ultrix_fs.c,v 1.13 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $	*/
 
 /*
@@ -132,7 +132,7 @@ struct ultrix_getmnt_args {
 #define ULTRIX_NM_WSIZE    0x0004  /* set write size */
 #define ULTRIX_NM_RSIZE    0x0008  /* set read size */
 #define ULTRIX_NM_TIMEO    0x0010  /* set initial timeout */
-#define ULTRIX_NM_RETRANS  0x0020  /* set number of request retrys */
+#define ULTRIX_NM_RETRANS  0x0020  /* set number of request retries */
 #define ULTRIX_NM_HOSTNAME 0x0040  /* set hostname for error printf */
 #define ULTRIX_NM_PGTHRESH 0x0080  /* set page threshold for exec */
 #define ULTRIX_NM_INT      0x0100  /* allow hard mount keyboard interrupts */
diff --git a/sys/dev/ic/aic79xx_openbsd.h b/sys/dev/ic/aic79xx_openbsd.h
index 0b4e60aecca..e34879a091c 100644
--- a/sys/dev/ic/aic79xx_openbsd.h
+++ b/sys/dev/ic/aic79xx_openbsd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx_openbsd.h,v 1.15 2004/12/30 17:29:55 krw Exp $	*/
+/*	$OpenBSD: aic79xx_openbsd.h,v 1.16 2005/12/10 11:45:43 miod Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -122,7 +122,7 @@ typedef struct pci_attach_args * ahd_dev_softc_t;
 /************************ Tunable Driver Parameters  **************************/
 /*
  * The number of dma segments supported.  The sequencer can handle any number
- * of physically contiguous S/G entrys.  To reduce the driver's memory
+ * of physically contiguous S/G entries.  To reduce the driver's memory
  * consumption, we limit the number supported to be sufficient to handle
  * the largest mapping supported by the kernel, MAXPHYS.  Assuming the
  * transfer is as fragmented as possible and unaligned, this turns out to
diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h
index 88c101b88fa..c2bb2cb4dd2 100644
--- a/sys/dev/ic/aic7xxx_openbsd.h
+++ b/sys/dev/ic/aic7xxx_openbsd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx_openbsd.h,v 1.15 2005/06/01 21:49:54 miod Exp $	*/
+/*	$OpenBSD: aic7xxx_openbsd.h,v 1.16 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: aic7xxx_osm.h,v 1.7 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ typedef struct pci_attach_args * ahc_dev_softc_t;
 /************************ Tunable Driver Parameters  **************************/
 /*
  * The number of DMA segments supported.  The sequencer can handle any number
- * of physically contiguous S/G entrys.  To reduce the driver's memory
+ * of physically contiguous S/G entries.  To reduce the driver's memory
  * consumption, we limit the number supported to be sufficient to handle
  * the largest mapping supported by the kernel, MAXPHYS.  Assuming the
  * transfer is as fragmented as possible and unaligned, this turns out to
diff --git a/sys/dev/ic/mpt.c b/sys/dev/ic/mpt.c
index b0e9c3571cc..054af56fadc 100644
--- a/sys/dev/ic/mpt.c
+++ b/sys/dev/ic/mpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpt.c,v 1.20 2005/12/03 04:00:08 marco Exp $	*/
+/*	$OpenBSD: mpt.c,v 1.21 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: mpt.c,v 1.4 2003/11/02 11:07:45 wiz Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 
 #include <dev/ic/mpt.h>
 
-#define MPT_MAX_TRYS 3
+#define MPT_MAX_TRIES 3
 #define MPT_MAX_WAIT 300000
 
 static int maxwait_ack = 0;
@@ -1542,7 +1542,7 @@ mpt_init(struct mpt_softc *mpt, u_int32_t who)
 		break;
 	}
 
-	for (try = 0; try < MPT_MAX_TRYS; try++) {
+	for (try = 0; try < MPT_MAX_TRIES; try++) {
 		/*
 		 * No need to reset if the IOC is already in the READY state.
 		 *
@@ -1744,7 +1744,7 @@ mpt_init(struct mpt_softc *mpt, u_int32_t who)
 		break;
 	}
 
-	if (try >= MPT_MAX_TRYS) {
+	if (try >= MPT_MAX_TRIES) {
 		mpt_prt(mpt, "failed to initialize IOC");
 		return (EIO);
 	}
diff --git a/sys/dev/ic/wdcreg.h b/sys/dev/ic/wdcreg.h
index ae85d181049..a50b53ae2ff 100644
--- a/sys/dev/ic/wdcreg.h
+++ b/sys/dev/ic/wdcreg.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdcreg.h,v 1.14 2005/08/27 14:08:38 jsg Exp $     */
+/*      $OpenBSD: wdcreg.h,v 1.15 2005/12/10 11:45:43 miod Exp $     */
 /*	$NetBSD: wdcreg.h,v 1.22 1999/03/07 14:02:54 bouyer Exp $	*/
 
 /*-
@@ -80,7 +80,7 @@
 #define WDCC_READ	0x20	/* disk read code */
 #define WDCC_WRITE	0x30	/* disk write code */
 #define WDCC__LONG	0x02	/* modifier -- access ecc bytes */
-#define WDCC__NORETRY	0x01	/* modifier -- no retrys */
+#define WDCC__NORETRY	0x01	/* modifier -- no entries */
 
 #define WDCC_FORMAT	0x50	/* disk format code */
 #define WDCC_DIAGNOSE	0x90	/* controller diagnostic */
diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index 5fb4a2bade1..6853ec54725 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap.c,v 1.28 2004/12/30 08:28:39 niklas Exp $	*/
+/*	$OpenBSD: uvm_amap.c,v 1.29 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -738,7 +738,7 @@ amap_copy(map, entry, waitf, canchunk, startva, endva)
  * => if we run out of memory we will unlock the amap and sleep _with_ the
  *	parent and child vm_map's locked(!).    we have to do this since
  *	we are in the middle of a fork(2) and we can't let the parent
- *	map change until we are done copying all the map entrys.
+ *	map change until we are done copying all the map entries.
  * => XXXCDC: out of memory should cause fork to fail, but there is
  *	currently no easy way to do this (needs fix)
  * => page queues must be unlocked (we may lock them)
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index e8db18b361d..c079dda5df7 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.73 2005/09/28 00:24:03 pedro Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.74 2005/12/10 11:45:43 miod Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /* 
@@ -545,7 +545,7 @@ uvm_map_init()
 	UVMCNT_INIT(uvm_mlk_hint,  UVMCNT_CNT, 0, "# map lookup hint hits", 0);
 
 	/*
-	 * now set up static pool of kernel map entrys ...
+	 * now set up static pool of kernel map entries ...
 	 */
 
 	simple_lock_init(&uvm.kentry_lock);
@@ -1670,7 +1670,7 @@ uvm_map_reserve(map, size, offset, align, raddr)
  *
  * => caller must WRITE-LOCK the map 
  * => we return TRUE if replacement was a success
- * => we expect the newents chain to have nnewents entrys on it and
+ * => we expect the newents chain to have nnewents entries on it and
  *    we expect newents->prev to point to the last entry on the list
  * => note newents is allowed to be NULL
  */
diff --git a/sys/uvm/uvm_stat.c b/sys/uvm/uvm_stat.c
index 3ef40a21635..f8884695399 100644
--- a/sys/uvm/uvm_stat.c
+++ b/sys/uvm/uvm_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_stat.c,v 1.16 2005/09/30 02:37:06 pedro Exp $	 */
+/*	$OpenBSD: uvm_stat.c,v 1.17 2005/12/10 11:45:43 miod Exp $	 */
 /*	$NetBSD: uvm_stat.c,v 1.18 2001/03/09 01:02:13 chs Exp $	 */
 
 /*
@@ -231,7 +231,7 @@ uvmexp_print(int (*pr)(const char *, ...))
 	(*pr)("    noram=%d, noanon=%d, pgwait=%d, pgrele=%d\n",
 	    uvmexp.fltnoram, uvmexp.fltnoanon, uvmexp.fltpgwait,
 	    uvmexp.fltpgrele);
-	(*pr)("    ok relocks(total)=%d(%d), anget(retrys)=%d(%d), "
+	(*pr)("    ok relocks(total)=%d(%d), anget(retries)=%d(%d), "
 	    "amapcopy=%d\n", uvmexp.fltrelckok, uvmexp.fltrelck,
 	    uvmexp.fltanget, uvmexp.fltanretry, uvmexp.fltamcopy);
 	(*pr)("    neighbor anon/obj pg=%d/%d, gets(lock/unlock)=%d/%d\n",