diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/aarch64/aarch64/locore.S | 6 | ||||
| -rw-r--r-- | sys/arch/aarch64/aarch64/pmap.c | 6 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/ixp425_qmgr.c | 6 | ||||
| -rw-r--r-- | sys/arch/ews4800mips/sbd/kbms_sbdio.c | 6 | ||||
| -rw-r--r-- | sys/arch/luna68k/stand/boot/sc.c | 4 | ||||
| -rw-r--r-- | sys/arch/mips/ingenic/ingenic_regs.h | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/sxreg.h | 14 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/psmreg.h | 2 | ||||
| -rw-r--r-- | sys/arch/xen/xen/privcmd.c | 6 | ||||
| -rw-r--r-- | sys/compat/common/compat_50_mod.c | 6 | ||||
| -rw-r--r-- | sys/dev/audio/audio.c | 6 | ||||
| -rw-r--r-- | sys/dev/hil/hil.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/aacreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/sl811hs.c | 6 | ||||
| -rw-r--r-- | sys/dev/marvell/mvxpsec.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/cxgb/cxgb_t3_hw.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/twa.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.h | 4 | ||||
| -rw-r--r-- | sys/fs/efs/efs_subr.c | 6 | ||||
| -rw-r--r-- | sys/kern/subr_interrupt.c | 6 | ||||
| -rw-r--r-- | sys/kern/sys_select.c | 10 | ||||
| -rw-r--r-- | sys/netinet/dccp_tfrc.c | 6 | ||||
| -rw-r--r-- | sys/netinet/sctp_pcb.c | 6 | ||||
| -rw-r--r-- | sys/sys/timex.h | 4 | ||||
| -rw-r--r-- | sys/ufs/chfs/chfs_readinode.c | 4 |
25 files changed, 72 insertions, 72 deletions
diff --git a/sys/arch/aarch64/aarch64/locore.S b/sys/arch/aarch64/aarch64/locore.S index 5da4861b7ef..23c2d985976 100644 --- a/sys/arch/aarch64/aarch64/locore.S +++ b/sys/arch/aarch64/aarch64/locore.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.83 2021/11/14 16:56:32 riastradh Exp $ */ +/* $NetBSD: locore.S,v 1.84 2021/12/10 20:36:02 andvar Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org> @@ -38,7 +38,7 @@ #include <aarch64/hypervisor.h> #include "assym.h" -RCSID("$NetBSD: locore.S,v 1.83 2021/11/14 16:56:32 riastradh Exp $") +RCSID("$NetBSD: locore.S,v 1.84 2021/12/10 20:36:02 andvar Exp $") #ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED #define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE @@ -148,7 +148,7 @@ ASENTRY_NP(aarch64_start) br x20 /* jump to the kernel virtual address */ aarch64_fatal: - PRINT("fatal error occured while booting\n") + PRINT("fatal error occurred while booting\n") /* return to bootloader. if switched from EL2 to EL1, It might fail */ mov lr, x27 mov sp, x28 diff --git a/sys/arch/aarch64/aarch64/pmap.c b/sys/arch/aarch64/aarch64/pmap.c index 500d936401c..3214bdcb610 100644 --- a/sys/arch/aarch64/aarch64/pmap.c +++ b/sys/arch/aarch64/aarch64/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $ */ +/* $NetBSD: pmap.c,v 1.121 2021/12/10 20:36:02 andvar Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.120 2021/12/07 21:37:36 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.121 2021/12/10 20:36:02 andvar Exp $"); #include "opt_arm_debug.h" #include "opt_ddb.h" @@ -2495,7 +2495,7 @@ pmap_fault_fixup(struct pmap *pm, vaddr_t va, vm_prot_t accessprot, bool user) goto done; } - /* pte is readable and writable, but occured fault? probably copy(9) */ + /* pte is readable and writable, but occurred fault? probably copy(9) */ if ((pte & LX_BLKPAG_AF) && ((pte & LX_BLKPAG_AP) == LX_BLKPAG_AP_RW)) goto done; diff --git a/sys/arch/arm/xscale/ixp425_qmgr.c b/sys/arch/arm/xscale/ixp425_qmgr.c index 93a801f610e..4a55c9b2b3e 100644 --- a/sys/arch/arm/xscale/ixp425_qmgr.c +++ b/sys/arch/arm/xscale/ixp425_qmgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixp425_qmgr.c,v 1.10 2019/12/27 09:25:57 msaitoh Exp $ */ +/* $NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $ */ /*- * Copyright (c) 2006 Sam Leffler, Errno Consulting @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> /*__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $");*/ -__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.10 2019/12/27 09:25:57 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $"); /* * Intel XScale Queue Manager support. @@ -436,7 +436,7 @@ ixpqmgr_qwrite(int qId, uint32_t entry) return ENOSPC; } /* - * No overflow occured : someone is draining the queue + * No overflow occurred : someone is draining the queue * and the current counter needs to be * updated from the current number of entries in the queue */ diff --git a/sys/arch/ews4800mips/sbd/kbms_sbdio.c b/sys/arch/ews4800mips/sbd/kbms_sbdio.c index a6f60e7f080..6e7f71467de 100644 --- a/sys/arch/ews4800mips/sbd/kbms_sbdio.c +++ b/sys/arch/ews4800mips/sbd/kbms_sbdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $ */ +/* $NetBSD: kbms_sbdio.c,v 1.15 2021/12/10 20:36:02 andvar Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.15 2021/12/10 20:36:02 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -203,7 +203,7 @@ kbms_sbdio_intr(void *arg) *reg->mouse_csr = 1; if (((v = *reg->mouse_csr) & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) { - /* Error occured. re-initialize */ + /* Error occurred. re-initialize */ printf("initialize mouse. error=%02x\n", v); mouse_init(sc); } else { diff --git a/sys/arch/luna68k/stand/boot/sc.c b/sys/arch/luna68k/stand/boot/sc.c index d27ead9e3c8..c48d9de6b88 100644 --- a/sys/arch/luna68k/stand/boot/sc.c +++ b/sys/arch/luna68k/stand/boot/sc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sc.c,v 1.18 2021/06/15 17:16:16 tsutsui Exp $ */ +/* $NetBSD: sc.c,v 1.19 2021/12/10 20:36:02 andvar Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -651,7 +651,7 @@ scintr(void) goto get_intr; } - /* Unknown Interrupt occured */ + /* Unknown interrupt occurred */ return -1; diff --git a/sys/arch/mips/ingenic/ingenic_regs.h b/sys/arch/mips/ingenic/ingenic_regs.h index f051f597e30..e75b53c0bcd 100644 --- a/sys/arch/mips/ingenic/ingenic_regs.h +++ b/sys/arch/mips/ingenic/ingenic_regs.h @@ -1,4 +1,4 @@ -/* $NetBSD: ingenic_regs.h,v 1.26 2020/08/09 07:08:29 skrll Exp $ */ +/* $NetBSD: ingenic_regs.h,v 1.27 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2014 Michael Lorenz @@ -536,9 +536,9 @@ gpio_as_input(uint32_t g, int pin) #define JZ_SMBFHCNT 0x1C /* Fast speed SMB SCL high count */ #define JZ_SMBFLCNT 0x20 /* Fast speed SMB SCL low count */ #define JZ_SMBINTST 0x2C /* SMB Interrupt Status */ - #define JZ_ISTT 0x400 /* START or RESTART occured */ - #define JZ_ISTP 0x200 /* STOP occured */ - #define JZ_TXABT 0x40 /* ABORT occured */ + #define JZ_ISTT 0x400 /* START or RESTART occurred */ + #define JZ_ISTP 0x200 /* STOP occurred */ + #define JZ_TXABT 0x40 /* ABORT occurred */ #define JZ_TXEMP 0x10 /* TX FIFO is low */ #define JZ_TXOF 0x08 /* TX FIFO is high */ #define JZ_RXFL 0x04 /* RX FIFO is at JZ_SMBRXTL*/ diff --git a/sys/arch/sparc/dev/sxreg.h b/sys/arch/sparc/dev/sxreg.h index 05b14ff4961..f496323ba32 100644 --- a/sys/arch/sparc/dev/sxreg.h +++ b/sys/arch/sparc/dev/sxreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: sxreg.h,v 1.20 2021/12/08 17:03:38 macallan Exp $ */ +/* $NetBSD: sxreg.h,v 1.21 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -82,13 +82,13 @@ */ #if 0 #define SX_PB 0x00001000 /* enable page bound checking */ -#define SX_WO 0x00002000 /* write occured ( by SX ) */ +#define SX_WO 0x00002000 /* write occurred ( by SX ) */ #define SX_GO 0x00004000 /* start/stop the processor */ #define SX_MT 0x00008000 /* instruction queue is empty */ #endif #define SX_PB 0x00000400 /* enable page bound checking */ -#define SX_WO 0x00000800 /* write occured ( by SX ) */ +#define SX_WO 0x00000800 /* write occurred ( by SX ) */ #define SX_GO 0x00001000 /* start/stop the processor */ #define SX_JB 0x00002000 /* Jammed/Busy specifies the type of events */ /* which increment the SX timer */ @@ -98,16 +98,16 @@ /* instruction is pending in the Q */ #define SX_B0MOD 0x00010000 /* When set by SX it indicates that a write */ /* to bank zero of the SX registers (0-31) */ - /* occured */ + /* occurred */ #define SX_B1MOD 0x00020000 /* When set by SX it indicates that a write */ /* to bank 1 of the SX registers (32-63) */ - /* occured */ + /* occurred */ #define SX_B2MOD 0x00040000 /* When set by SX it indicates that a write */ /* to bank 2 of the SX registers (64-95) */ - /* occured */ + /* occurred */ #define SX_B3MOD 0x00080000 /* When set by SX it indicates that a write */ /* to bank 3 of the SX registers (96-127) */ - /* occured */ + /* occurred */ /* SX_ERROR */ #define SX_SE1 0x00000001 /* illegal instruction */ diff --git a/sys/arch/sparc64/dev/psmreg.h b/sys/arch/sparc64/dev/psmreg.h index d5c059c1c74..24dd135ca8d 100644 --- a/sys/arch/sparc64/dev/psmreg.h +++ b/sys/arch/sparc64/dev/psmreg.h @@ -71,7 +71,7 @@ #define PSM_STAT_OVT 0x02 /* Over temperature condition */ #define PSM_STAT_UN1 0x04 /* Unused */ #define PSM_STAT_UN2 0x08 /* Unused */ -#define PSM_STAT_ERR 0x10 /* Hardware error occured */ +#define PSM_STAT_ERR 0x10 /* Hardware error occurred */ #define PSM_STAT_MCR 0x20 /* Master Command Register busy */ #define PSM_STAT_WBF 0x40 /* Write buffer full */ #define PSM_STAT_RDA 0x80 /* Read data available */ diff --git a/sys/arch/xen/xen/privcmd.c b/sys/arch/xen/xen/privcmd.c index 33a665aa6de..4f4be5973b3 100644 --- a/sys/arch/xen/xen/privcmd.c +++ b/sys/arch/xen/xen/privcmd.c @@ -1,4 +1,4 @@ -/* $NetBSD: privcmd.c,v 1.60 2020/11/30 17:06:02 bouyer Exp $ */ +/* $NetBSD: privcmd.c,v 1.61 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2004 Christian Limpach. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.60 2020/11/30 17:06:02 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: privcmd.c,v 1.61 2021/12/10 20:36:03 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -772,7 +772,7 @@ privcmd_ioctl(void *v) hc->retval = error; error = 0; } else { - /* error occured, return the errno */ + /* error occurred, return the errno */ error = privcmd_xen2bsd_errno(error); hc->retval = 0; } diff --git a/sys/compat/common/compat_50_mod.c b/sys/compat/common/compat_50_mod.c index 7c9e87a0694..6754ef96624 100644 --- a/sys/compat/common/compat_50_mod.c +++ b/sys/compat/common/compat_50_mod.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat_50_mod.c,v 1.3 2019/04/15 02:07:11 pgoyette Exp $ */ +/* $NetBSD: compat_50_mod.c,v 1.4 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.3 2019/04/15 02:07:11 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.4 2021/12/10 20:36:03 andvar Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -91,7 +91,7 @@ compat_50_init(void) return error; -/* If an error occured, undo all previous set-up before returning */ +/* If an error occurred, undo all previous set-up before returning */ err3: kern_select_50_fini(); diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c index cf2f055ddba..fcce3c88672 100644 --- a/sys/dev/audio/audio.c +++ b/sys/dev/audio/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.111 2021/12/05 02:56:55 msaitoh Exp $ */ +/* $NetBSD: audio.c,v 1.112 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -138,7 +138,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.111 2021/12/05 02:56:55 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.112 2021/12/10 20:36:03 andvar Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -6917,7 +6917,7 @@ audio_mixers_get_format(struct audio_softc *sc, struct audio_info *ai) * It indicates the number of times reached EOF(?). * * ai.{play,record}.error (R/-) - * Non-zero indicates overflow/underflow has occured. + * Non-zero indicates overflow/underflow has occurred. * * ai.{play,record}.waiting (R/-) * Non-zero indicates that other process waits to open. diff --git a/sys/dev/hil/hil.c b/sys/dev/hil/hil.c index ee5d626f317..09823ebd355 100644 --- a/sys/dev/hil/hil.c +++ b/sys/dev/hil/hil.c @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.5 2021/08/07 16:19:11 thorpej Exp $ */ +/* $NetBSD: hil.c,v 1.6 2021/12/10 20:36:03 andvar Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -390,7 +390,7 @@ hil_process_poll(struct hil_softc *sc, uint8_t stat, uint8_t c) case HIL_UNPLUGGED: /* * Remember that an unplugged event - * occured; it will be processed upon + * occurred; it will be processed upon * leaving polled mode... */ sc->sc_pending = HIL_PENDING_UNPLUGGED; diff --git a/sys/dev/ic/aacreg.h b/sys/dev/ic/aacreg.h index c33d3ecdb94..6c2f9021f4a 100644 --- a/sys/dev/ic/aacreg.h +++ b/sys/dev/ic/aacreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: aacreg.h,v 1.13 2008/10/02 08:21:57 sborrill Exp $ */ +/* $NetBSD: aacreg.h,v 1.14 2021/12/10 20:36:03 andvar Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -1325,7 +1325,7 @@ typedef enum { AifEnSMARTEvent, /* SMART Event */ AifEnBatteryNeedsRecond, /* The battery needs reconditioning */ AifEnClusterEvent, /* Some cluster event */ - AifEnDiskSetEvent, /* A disk set event occured. */ + AifEnDiskSetEvent, /* A disk set event occurred. */ AifDriverNotifyStart=199, /* Notifies for host driver go here */ /* Host driver notifications start here */ AifDenMorphComplete, /* A morph operation completed */ diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c index 053fb2bb126..e5773430cca 100644 --- a/sys/dev/ic/sl811hs.c +++ b/sys/dev/ic/sl811hs.c @@ -1,4 +1,4 @@ -/* $NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $ */ +/* $NetBSD: sl811hs.c,v 1.108 2021/12/10 20:36:03 andvar Exp $ */ /* * Not (c) 2007 Matthew Orgass @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.107 2021/08/09 20:49:10 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.108 2021/12/10 20:36:03 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_slhci.h" @@ -2026,7 +2026,7 @@ slhci_abdone(struct slhci_softc *sc, int ab) * However, I have seen this problem again ("done but not started" * errors), which in some cases cases the SETUP status bit to remain * set on future transfers. In other cases, the SETUP bit is not set - * and no data corruption occurs. This occured while using both umass + * and no data corruption occurs. This occurred while using both umass * and aue on a powered hub (maybe triggered by some local activity * also) and needs several reads of the 200MB file to trigger. The * driver now halts if SETUP is detected. diff --git a/sys/dev/marvell/mvxpsec.c b/sys/dev/marvell/mvxpsec.c index 650a371383e..c2c4e6372a6 100644 --- a/sys/dev/marvell/mvxpsec.c +++ b/sys/dev/marvell/mvxpsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvxpsec.c,v 1.8 2021/08/13 20:26:07 andvar Exp $ */ +/* $NetBSD: mvxpsec.c,v 1.9 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -1280,7 +1280,7 @@ mvxpsec_eintr_ack(struct mvxpsec_softc *sc) /* * Interrupt statistics * - * this is NOT a statistics of how may times the events 'occured'. + * this is NOT a statistics of how many times the events 'occurred'. * this ONLY means how many times the events 'handled'. */ INLINE void diff --git a/sys/dev/pci/cxgb/cxgb_t3_hw.c b/sys/dev/pci/cxgb/cxgb_t3_hw.c index d9ad2e2a709..d23f3c65a1f 100644 --- a/sys/dev/pci/cxgb/cxgb_t3_hw.c +++ b/sys/dev/pci/cxgb/cxgb_t3_hw.c @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cxgb_t3_hw.c,v 1.6 2021/11/10 17:19:30 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_t3_hw.c,v 1.7 2021/12/10 20:36:04 andvar Exp $"); #ifdef CONFIG_DEFINED @@ -1218,7 +1218,7 @@ struct intr_info { * * A table driven interrupt handler that applies a set of masks to an * interrupt status word and performs the corresponding actions if the - * interrupts described by the mask have occured. The actions include + * interrupts described by the mask have occurred. The actions include * optionally printing a warning or alert message, and optionally * incrementing a stat counter. The table is terminated by an entry * specifying mask 0. Returns the number of fatal interrupt conditions. diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c index 0782e41c856..1183648a180 100644 --- a/sys/dev/pci/twa.c +++ b/sys/dev/pci/twa.c @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.60 2021/08/07 16:19:14 thorpej Exp $ */ +/* $NetBSD: twa.c,v 1.61 2021/12/10 20:36:04 andvar Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.60 2021/08/07 16:19:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.61 2021/12/10 20:36:04 andvar Exp $"); //#define TWA_DEBUG @@ -153,7 +153,7 @@ static const struct twa_message twa_aen_table[] = { {0x0000, "AEN queue empty"}, {0x0001, "Controller reset occurred"}, {0x0002, "Degraded unit detected"}, - {0x0003, "Controller error occured"}, + {0x0003, "Controller error occurred"}, {0x0004, "Background rebuild failed"}, {0x0005, "Background rebuild done"}, {0x0006, "Incomplete unit detected"}, diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h index a04642ebbea..2a9c086bf30 100644 --- a/sys/dev/raidframe/rf_reconstruct.h +++ b/sys/dev/raidframe/rf_reconstruct.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconstruct.h,v 1.30 2021/07/23 00:54:45 oster Exp $ */ +/* $NetBSD: rf_reconstruct.h,v 1.31 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -130,7 +130,7 @@ struct RF_ReconCtrl_s { RF_ReconUnitCount_t numRUsComplete; /* number of Reconstruction Units done */ RF_ReconUnitCount_t numRUsTotal; /* total number of Reconstruction Units */ int error; /* non-0 indicates that an error has - occured during reconstruction, and + occurred during reconstruction, and the reconstruction is in the process of bailing out. */ diff --git a/sys/fs/efs/efs_subr.c b/sys/fs/efs/efs_subr.c index 2c29191b7f3..9364cb730e0 100644 --- a/sys/fs/efs/efs_subr.c +++ b/sys/fs/efs/efs_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: efs_subr.c,v 1.13 2020/09/07 00:11:47 christos Exp $ */ +/* $NetBSD: efs_subr.c,v 1.14 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble <rumble@ephemeral.org> @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.13 2020/09/07 00:11:47 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efs_subr.c,v 1.14 2021/12/10 20:36:04 andvar Exp $"); #include <sys/param.h> #include <sys/kauth.h> @@ -50,7 +50,7 @@ struct pool efs_inode_pool; * At some point SGI changed the checksum algorithm slightly, which can be * enabled with the 'new' flag. * - * Presumably this change occured on or before 24 Oct 1988 (around IRIX 3.1), + * Presumably this change occurred on or before 24 Oct 1988 (around IRIX 3.1), * so we're pretty unlikely to ever actually see an old checksum. Further, it * means that EFS_NEWMAGIC filesystems (IRIX >= 3.3) must match the new * checksum whereas EFS_MAGIC filesystems could potentially use either diff --git a/sys/kern/subr_interrupt.c b/sys/kern/subr_interrupt.c index ed9b38556a1..bbfe1d49cc9 100644 --- a/sys/kern/subr_interrupt.c +++ b/sys/kern/subr_interrupt.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_interrupt.c,v 1.4 2018/01/28 22:24:58 christos Exp $ */ +/* $NetBSD: subr_interrupt.c,v 1.5 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_interrupt.c,v 1.4 2018/01/28 22:24:58 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_interrupt.c,v 1.5 2021/12/10 20:36:04 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -202,7 +202,7 @@ interrupt_intrio_list_size(size_t *ilsize) /* * Set intrctl list data to "il", and return list structure bytes. - * If error occured, return <0. + * If error occurred, return <0. * If "data" == NULL, simply return list structure bytes. */ static int diff --git a/sys/kern/sys_select.c b/sys/kern/sys_select.c index 565ebc33d37..617d1521b89 100644 --- a/sys/kern/sys_select.c +++ b/sys/kern/sys_select.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_select.c,v 1.56 2021/09/29 02:47:22 thorpej Exp $ */ +/* $NetBSD: sys_select.c,v 1.57 2021/12/10 20:36:04 andvar Exp $ */ /*- * Copyright (c) 2007, 2008, 2009, 2010, 2019, 2020 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.56 2021/09/29 02:47:22 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.57 2021/12/10 20:36:04 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -295,7 +295,7 @@ sel_do_scan(const char *opname, void *fds, const int nf, const size_t ni, break; /* * Acquire the lock and perform the (re)checks. Note, if - * collision has occured, then our state does not matter, + * collision has occurred, then our state does not matter, * as we must perform re-scan. Therefore, check it first. */ state_check: @@ -307,12 +307,12 @@ state_check: continue; } if (__predict_true(l->l_selflag == SEL_EVENT)) { - /* Events occured, they are set directly. */ + /* Events occurred, they are set directly. */ mutex_spin_exit(lock); break; } if (__predict_true(l->l_selflag == SEL_RESET)) { - /* Events occured, but re-scan is requested. */ + /* Events occurred, but re-scan is requested. */ mutex_spin_exit(lock); selclear(); continue; diff --git a/sys/netinet/dccp_tfrc.c b/sys/netinet/dccp_tfrc.c index 87c6a4a1eb5..33e9aa91e8a 100644 --- a/sys/netinet/dccp_tfrc.c +++ b/sys/netinet/dccp_tfrc.c @@ -1,5 +1,5 @@ /* $KAME: dccp_tfrc.c,v 1.16 2006/03/01 17:34:08 nishida Exp $ */ -/* $NetBSD: dccp_tfrc.c,v 1.8 2021/12/05 07:26:35 msaitoh Exp $ */ +/* $NetBSD: dccp_tfrc.c,v 1.9 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2003 Nils-Erik Mattsson @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.8 2021/12/05 07:26:35 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dccp_tfrc.c,v 1.9 2021/12/10 20:36:04 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_dccp.h" @@ -1463,7 +1463,7 @@ tfrc_recv_detectLoss(struct tfrc_recv_ccb * cb) TFRC_RECV_FINDDATAPACKET(cb, aLoss, num_later); if (aLoss == NULL) { if (TAILQ_EMPTY(&(cb->li_hist))) { - /* no loss event have occured yet */ + /* no loss event have occurred yet */ /* todo: find a lost data packet by comparing * to initial seq num */ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 1003f0ca2a8..dcd32ebfa7e 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -1,5 +1,5 @@ /* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */ -/* $NetBSD: sctp_pcb.c,v 1.22 2021/09/19 10:34:10 andvar Exp $ */ +/* $NetBSD: sctp_pcb.c,v 1.23 2021/12/10 20:36:04 andvar Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. @@ -33,7 +33,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.22 2021/09/19 10:34:10 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.23 2021/12/10 20:36:04 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -4016,7 +4016,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m, return (-1); } } - /* since a unlock occured we must check the + /* since a unlock occurred we must check the * TCB's state and the pcb's gone flags. */ if (l_inp->sctp_flags & (SCTP_PCB_FLAGS_SOCKET_GONE|SCTP_PCB_FLAGS_SOCKET_ALLGONE)) { diff --git a/sys/sys/timex.h b/sys/sys/timex.h index 280f15ddbe3..6a19c42ea2c 100644 --- a/sys/sys/timex.h +++ b/sys/sys/timex.h @@ -1,4 +1,4 @@ -/* $NetBSD: timex.h,v 1.18 2009/04/05 19:59:26 christos Exp $ */ +/* $NetBSD: timex.h,v 1.19 2021/12/10 20:36:04 andvar Exp $ */ /*- *********************************************************************** @@ -186,7 +186,7 @@ f\17\1CLK\0=\0A\0=\1B\0" #define TIME_INS 1 /* insert leap second warning */ #define TIME_DEL 2 /* delete leap second warning */ #define TIME_OOP 3 /* leap second in progress */ -#define TIME_WAIT 4 /* leap second has occured */ +#define TIME_WAIT 4 /* leap second has occurred */ #define TIME_ERROR 5 /* error (see status word) */ /* diff --git a/sys/ufs/chfs/chfs_readinode.c b/sys/ufs/chfs/chfs_readinode.c index 395d375ec4f..e7d86c71f28 100644 --- a/sys/ufs/chfs/chfs_readinode.c +++ b/sys/ufs/chfs/chfs_readinode.c @@ -1,4 +1,4 @@ -/* $NetBSD: chfs_readinode.c,v 1.11 2021/07/15 22:39:06 andvar Exp $ */ +/* $NetBSD: chfs_readinode.c,v 1.12 2021/12/10 20:36:04 andvar Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -135,7 +135,7 @@ const rb_tree_ops_t frag_rbtree_ops = { * Returns: 0 - if everything OK; * 1 - if CRC is incorrect; * 2 - else; - * error code if an error occured. + * error code if an error occurred. */ int chfs_check_td_data(struct chfs_mount *chmp, |
