Module Name: src
Committed By: andvar
Date: Wed May 4 07:48:35 UTC 2022
Modified Files:
src/sys/arch/sun3/sun3x: pmap.c
src/sys/arch/x68k/dev: mha.c
src/sys/dev/i2o: iopsp.c
src/sys/dev/sbus: stp4020.c
src/sys/net: ppp_tty.c
Log Message:
fix various typos in comments and log messages.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/sun3/sun3x/pmap.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/i2o/iopsp.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/sbus/stp4020.c
cvs rdiff -u -r1.69 -r1.70 src/sys/net/ppp_tty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun3/sun3x/pmap.c
diff -u src/sys/arch/sun3/sun3x/pmap.c:1.119 src/sys/arch/sun3/sun3x/pmap.c:1.120
--- src/sys/arch/sun3/sun3x/pmap.c:1.119 Tue May 3 20:52:31 2022
+++ src/sys/arch/sun3/sun3x/pmap.c Wed May 4 07:48:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.119 2022/05/03 20:52:31 andvar Exp $ */
+/* $NetBSD: pmap.c,v 1.120 2022/05/04 07:48:34 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.119 2022/05/03 20:52:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2022/05/04 07:48:34 andvar Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -222,7 +222,7 @@ int pmap_debug = 0;
* For every A table in the MMU A area, there will be a corresponding
* a_tmgr structure in the TMGR A area. The same will be true for
* the B and C tables. This arrangement will make it easy to find the
- * controling tmgr structure for any table in the system by use of
+ * controlling tmgr structure for any table in the system by use of
* (relatively) simple macros.
*/
@@ -293,7 +293,7 @@ struct pool pmap_pmap_pool;
* physical memory. Memory is divided into 4 banks which are physically
* locatable on the system board. Although the size of these banks varies
* with the size of memory they contain, their base addresses are
- * permenently fixed. The following structure, which describes these
+ * permanently fixed. The following structure, which describes these
* banks, is initialized by pmap_bootstrap() after it reads from a similar
* structure provided by the ROM Monitor.
*
@@ -1218,7 +1218,7 @@ pmap_init_pv(void)
*
* Note: A "managed" address is one that was reported to the VM system as
* a "usable page" during system startup. As such, the VM system expects the
- * pmap module to keep an accurate track of the useage of those pages.
+ * pmap module to keep an accurate track of the usage of those pages.
* Any page not given to the VM system at startup does not exist (as far as
* the VM system is concerned) and is therefore "unmanaged." Examples are
* those pages which belong to the ROM monitor and the memory allocated before
@@ -1704,7 +1704,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
/*
* Determine if the physical address being mapped is on-board RAM.
* Any other area of the address space is likely to belong to a
- * device and hence it would be disasterous to cache its contents.
+ * device and hence it would be disastrous to cache its contents.
*/
if ((managed = is_managed(pa)) == false)
mapflags |= PMAP_NC;
@@ -2064,7 +2064,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
* Note that the kernel should never take a fault on any page
* between [ KERNBASE .. virtual_avail ] and this is checked in
* trap.c for kernel-mode MMU faults. This means that mappings
- * created in that range must be implicily wired. -gwr
+ * created in that range must be implicitly wired. -gwr
*/
void
pmap_enter_kernel(vaddr_t va, paddr_t pa, vm_prot_t prot)
@@ -3026,7 +3026,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, va
* If we just modified the current address space,
* make sure to flush the MMU cache.
*
- * XXX - this could be an unecessarily large flush.
+ * XXX - this could be an unnecessarily large flush.
* XXX - Could decide, based on the size of the VA range
* to be removed, whether to flush "by pages" or "all".
*/
@@ -3060,7 +3060,7 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t s
/*
* The following code works with what I call a 'granularity
- * reduction algorithim'. A range of addresses will always have
+ * reduction algorithm'. A range of addresses will always have
* the following properties, which are classified according to
* how the range relates to the size of the current granularity
* - an A table entry:
@@ -3071,13 +3071,13 @@ pmap_remove_a(a_tmgr_t *a_tbl, vaddr_t s
*
* A range will always start on a granularity boundary, illustrated
* by '+' signs in the table above, or it will start at some point
- * inbetween a granularity boundary, as illustrated by point 1.
+ * in-between a granularity boundary, as illustrated by point 1.
* The first step in removing a range of addresses is to remove the
* range between 1 and 2, the nearest granularity boundary. This
* job is handled by the section of code governed by the
* 'if (start < nstart)' statement.
*
- * A range will always encompass zero or more intergral granules,
+ * A range will always encompass zero or more integral granules,
* illustrated by points 2 and 3. Integral granules are easy to
* remove. The removal of these granules is the second step, and
* is handled by the code block 'if (nstart < nend)'.
@@ -3592,7 +3592,7 @@ pmap_kcore_hdr(struct sun3x_kcore_hdr *s
/* pmap_virtual_space INTERFACE
**
* Return the current available range of virtual addresses in the
- * arguuments provided. Only really called once.
+ * arguments provided. Only really called once.
*/
void
pmap_virtual_space(vaddr_t *vstart, vaddr_t *vend)
@@ -3649,7 +3649,7 @@ pmap_count(pmap_t pmap, int type)
/*
* If the pmap does not have its own A table manager, it has no
- * valid entires.
+ * valid entries.
*/
if (pmap->pm_a_tmgr == NULL)
return 0;
Index: src/sys/arch/x68k/dev/mha.c
diff -u src/sys/arch/x68k/dev/mha.c:1.56 src/sys/arch/x68k/dev/mha.c:1.57
--- src/sys/arch/x68k/dev/mha.c:1.56 Sat Aug 7 16:19:07 2021
+++ src/sys/arch/x68k/dev/mha.c Wed May 4 07:48:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mha.c,v 1.56 2021/08/07 16:19:07 thorpej Exp $ */
+/* $NetBSD: mha.c,v 1.57 2022/05/04 07:48:34 andvar Exp $ */
/*-
* Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.56 2021/08/07 16:19:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.57 2022/05/04 07:48:34 andvar Exp $");
#include "opt_ddb.h"
@@ -812,7 +812,7 @@ mha_setsync(struct mha_softc *sc, struct
/*
* Schedule a SCSI operation. This has now been pulled out of the interrupt
* handler so that we may call it from mha_scsi_cmd and mha_done. This may
- * save us an unecessary interrupt just to get things going. Should only be
+ * save us an unnecessary interrupt just to get things going. Should only be
* called when state == SPC_IDLE and at bio pl.
*/
void
Index: src/sys/dev/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.40 src/sys/dev/i2o/iopsp.c:1.41
--- src/sys/dev/i2o/iopsp.c:1.40 Sat Aug 7 16:19:11 2021
+++ src/sys/dev/i2o/iopsp.c Wed May 4 07:48:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.40 2021/08/07 16:19:11 thorpej Exp $ */
+/* $NetBSD: iopsp.c,v 1.41 2022/05/04 07:48:34 andvar Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.40 2021/08/07 16:19:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.41 2022/05/04 07:48:34 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,7 @@ iopsp_attach(device_t parent, device_t s
fc = (param.p.ci.bustype == I2O_HBA_BUS_FCA);
/*
- * Say what the device is. If we can find out what the controling
+ * Say what the device is. If we can find out what the controlling
* device is, say what that is too.
*/
aprint_normal(": SCSI port");
Index: src/sys/dev/sbus/stp4020.c
diff -u src/sys/dev/sbus/stp4020.c:1.71 src/sys/dev/sbus/stp4020.c:1.72
--- src/sys/dev/sbus/stp4020.c:1.71 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/sbus/stp4020.c Wed May 4 07:48:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.71 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: stp4020.c,v 1.72 2022/05/04 07:48:35 andvar Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.71 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.72 2022/05/04 07:48:35 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -982,14 +982,14 @@ stp4020_chip_socket_settype(pcmcia_chips
h->int_enable = v;
h->int_disable = v & ~STP4020_ICR0_IOIE;
#endif
- DPRINTF(("%s: configuring card for IO useage\n", device_xname(h->sc->sc_dev)));
+ DPRINTF(("%s: configuring card for IO usage\n", device_xname(h->sc->sc_dev)));
} else {
v |= STP4020_ICR0_IFTYPE_MEM;
#ifndef SUN4U
h->int_enable = h->int_disable = v;
#endif
- DPRINTF(("%s: configuring card for IO useage\n", device_xname(h->sc->sc_dev)));
- DPRINTF(("%s: configuring card for MEM ONLY useage\n", device_xname(h->sc->sc_dev)));
+ DPRINTF(("%s: configuring card for IO usage\n", device_xname(h->sc->sc_dev)));
+ DPRINTF(("%s: configuring card for MEM ONLY usage\n", device_xname(h->sc->sc_dev)));
}
stp4020_wr_sockctl(h, STP4020_ICR0_IDX, v);
}
Index: src/sys/net/ppp_tty.c
diff -u src/sys/net/ppp_tty.c:1.69 src/sys/net/ppp_tty.c:1.70
--- src/sys/net/ppp_tty.c:1.69 Mon Dec 13 02:53:43 2021
+++ src/sys/net/ppp_tty.c Wed May 4 07:48:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ppp_tty.c,v 1.69 2021/12/13 02:53:43 msaitoh Exp $ */
+/* $NetBSD: ppp_tty.c,v 1.70 2022/05/04 07:48:35 andvar Exp $ */
/* Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp */
/*
@@ -93,7 +93,7 @@
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.69 2021/12/13 02:53:43 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.70 2022/05/04 07:48:35 andvar Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@@ -313,7 +313,7 @@ pppread(struct tty *tp, struct uio *uio,
if (sc == NULL)
return 0;
/*
- * Loop waiting for input, checking that nothing disasterous
+ * Loop waiting for input, checking that nothing disastrous
* happens in the meantime.
*/
mutex_spin_enter(&tty_lock);
