Module Name: src
Committed By: andvar
Date: Fri Dec 10 20:36:05 UTC 2021
Modified Files:
src/lib/libc/db/man: dbm_clearerr.3
src/lib/libc/gen: wordexp.3
src/lib/libc/sys: send.2
src/lib/libterminfo: term.h
src/libexec/httpd: bozohttpd.c
src/sys/arch/aarch64/aarch64: locore.S pmap.c
src/sys/arch/arm/xscale: ixp425_qmgr.c
src/sys/arch/ews4800mips/sbd: kbms_sbdio.c
src/sys/arch/luna68k/stand/boot: sc.c
src/sys/arch/mips/ingenic: ingenic_regs.h
src/sys/arch/sparc/dev: sxreg.h
src/sys/arch/sparc64/dev: psmreg.h
src/sys/arch/xen/xen: privcmd.c
src/sys/compat/common: compat_50_mod.c
src/sys/dev/audio: audio.c
src/sys/dev/hil: hil.c
src/sys/dev/ic: aacreg.h sl811hs.c
src/sys/dev/marvell: mvxpsec.c
src/sys/dev/pci: twa.c
src/sys/dev/pci/cxgb: cxgb_t3_hw.c
src/sys/dev/raidframe: rf_reconstruct.h
src/sys/fs/efs: efs_subr.c
src/sys/kern: subr_interrupt.c sys_select.c
src/sys/netinet: dccp_tfrc.c sctp_pcb.c
src/sys/sys: timex.h
src/sys/ufs/chfs: chfs_readinode.c
src/tests/dev/audio: audiotest.c
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
s/occured/occurred/ in comments, log messages and man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/db/man/dbm_clearerr.3
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/wordexp.3
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/sys/send.2
cvs rdiff -u -r1.24 -r1.25 src/lib/libterminfo/term.h
cvs rdiff -u -r1.136 -r1.137 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/aarch64/aarch64/locore.S
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/ixp425_qmgr.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/luna68k/stand/boot/sc.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/ingenic/ingenic_regs.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/dev/sxreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/psmreg.h
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/xen/xen/privcmd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/hil/hil.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/aacreg.h
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/marvell/mvxpsec.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/twa.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/cxgb/cxgb_t3_hw.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/raidframe/rf_reconstruct.h
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/efs/efs_subr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/kern/subr_interrupt.c
cvs rdiff -u -r1.56 -r1.57 src/sys/kern/sys_select.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netinet/dccp_tfrc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netinet/sctp_pcb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/timex.h
cvs rdiff -u -r1.11 -r1.12 src/sys/ufs/chfs/chfs_readinode.c
cvs rdiff -u -r1.17 -r1.18 src/tests/dev/audio/audiotest.c
cvs rdiff -u -r1.45 -r1.46 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/db/man/dbm_clearerr.3
diff -u src/lib/libc/db/man/dbm_clearerr.3:1.6 src/lib/libc/db/man/dbm_clearerr.3:1.7
--- src/lib/libc/db/man/dbm_clearerr.3:1.6 Sun May 26 06:18:13 2019
+++ src/lib/libc/db/man/dbm_clearerr.3 Fri Dec 10 20:36:02 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: dbm_clearerr.3,v 1.6 2019/05/26 06:18:13 abhinav Exp $
+.\" $NetBSD: dbm_clearerr.3,v 1.7 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -236,7 +236,7 @@ function returns a content
.Fa datum ;
if no record matching
.Fa key
-was found or if an error occured, its
+was found or if an error occurred, its
.Fa dptr
member is a null pointer.
.Pp
@@ -263,7 +263,7 @@ and
.Fn dbm_nextkey
functions return a key
.Fa datum .
-When the end of the database is reached or if an error occured, its
+When the end of the database is reached or if an error occurred, its
.Fa dptr
member is a null pointer.
.Pp
Index: src/lib/libc/gen/wordexp.3
diff -u src/lib/libc/gen/wordexp.3:1.3 src/lib/libc/gen/wordexp.3:1.4
--- src/lib/libc/gen/wordexp.3:1.3 Mon Jul 3 21:32:49 2017
+++ src/lib/libc/gen/wordexp.3 Fri Dec 10 20:36:02 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: wordexp.3,v 1.3 2017/07/03 21:32:49 wiz Exp $
+.\" $NetBSD: wordexp.3,v 1.4 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 2002 Tim J. Robbins
.\" All rights reserved.
@@ -163,7 +163,7 @@ Not enough memory to store the result.
Shell syntax error in
.Fa words .
.It Dv WRDE_ERRNO
-An internal error occured and
+An internal error occurred and
.Va errno
is set to indicate the error.
.El
Index: src/lib/libc/sys/send.2
diff -u src/lib/libc/sys/send.2:1.33 src/lib/libc/sys/send.2:1.34
--- src/lib/libc/sys/send.2:1.33 Sun Mar 28 03:29:31 2021
+++ src/lib/libc/sys/send.2 Fri Dec 10 20:36:02 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: send.2,v 1.33 2021/03/28 03:29:31 dholland Exp $
+.\" $NetBSD: send.2,v 1.34 2021/12/10 20:36:02 andvar Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -186,7 +186,7 @@ if an error occurred.
The
.Fn sendmmsg
call returns the number of messages sent, or \-1
-if an error occured.
+if an error occurred.
.Sh ERRORS
.Fn send ,
.Fn sendto ,
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.24 src/lib/libterminfo/term.h:1.25
--- src/lib/libterminfo/term.h:1.24 Fri Jun 5 22:08:10 2020
+++ src/lib/libterminfo/term.h Fri Dec 10 20:36:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.24 2020/06/05 22:08:10 roy Exp $ */
+/* $NetBSD: term.h,v 1.25 2021/12/10 20:36:02 andvar Exp $ */
/*
* Copyright (c) 2009, 2010, 2011, 2013, 2020 The NetBSD Foundation, Inc.
@@ -1749,7 +1749,7 @@ enum TISTRS{
* key_ll: sent by home-down key
* key_mark: sent by mark key
* key_message: sent by message key
- * key_mouse: 0631, Mouse event has occured
+ * key_mouse: 0631, Mouse event has occurred
* key_move: sent by move key
* key_next: sent by next-object key
* key_npage: sent by next-page key
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.136 src/libexec/httpd/bozohttpd.c:1.137
--- src/libexec/httpd/bozohttpd.c:1.136 Tue Aug 24 09:47:36 2021
+++ src/libexec/httpd/bozohttpd.c Fri Dec 10 20:36:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.136 2021/08/24 09:47:36 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.137 2021/12/10 20:36:02 andvar Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -2164,7 +2164,7 @@ static struct errors_map {
{ 413, "413 Payload Too Large", "Use smaller requests", },
{ 417, "417 Expectation Failed","Expectations not available", },
{ 420, "420 Enhance Your Calm","Chill, Winston", },
- { 500, "500 Internal Error", "An error occured on the server", },
+ { 500, "500 Internal Error", "An error occurred on the server", },
{ 501, "501 Not Implemented", "This request is not available", },
{ 0, NULL, NULL, },
};
Index: src/sys/arch/aarch64/aarch64/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.83 src/sys/arch/aarch64/aarch64/locore.S:1.84
--- src/sys/arch/aarch64/aarch64/locore.S:1.83 Sun Nov 14 16:56:32 2021
+++ src/sys/arch/aarch64/aarch64/locore.S Fri Dec 10 20:36:02 2021
@@ -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 <[email protected]>
@@ -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
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.120 src/sys/arch/aarch64/aarch64/pmap.c:1.121
--- src/sys/arch/aarch64/aarch64/pmap.c:1.120 Tue Dec 7 21:37:36 2021
+++ src/sys/arch/aarch64/aarch64/pmap.c Fri Dec 10 20:36:02 2021
@@ -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 <[email protected]>
@@ -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_
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;
Index: src/sys/arch/arm/xscale/ixp425_qmgr.c
diff -u src/sys/arch/arm/xscale/ixp425_qmgr.c:1.10 src/sys/arch/arm/xscale/ixp425_qmgr.c:1.11
--- src/sys/arch/arm/xscale/ixp425_qmgr.c:1.10 Fri Dec 27 09:25:57 2019
+++ src/sys/arch/arm/xscale/ixp425_qmgr.c Fri Dec 10 20:36:02 2021
@@ -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
*/
Index: src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.14 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.15
--- src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.14 Sat Sep 18 15:14:40 2021
+++ src/sys/arch/ews4800mips/sbd/kbms_sbdio.c Fri Dec 10 20:36:02 2021
@@ -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 {
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.18 src/sys/arch/luna68k/stand/boot/sc.c:1.19
--- src/sys/arch/luna68k/stand/boot/sc.c:1.18 Tue Jun 15 17:16:16 2021
+++ src/sys/arch/luna68k/stand/boot/sc.c Fri Dec 10 20:36:02 2021
@@ -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;
Index: src/sys/arch/mips/ingenic/ingenic_regs.h
diff -u src/sys/arch/mips/ingenic/ingenic_regs.h:1.26 src/sys/arch/mips/ingenic/ingenic_regs.h:1.27
--- src/sys/arch/mips/ingenic/ingenic_regs.h:1.26 Sun Aug 9 07:08:29 2020
+++ src/sys/arch/mips/ingenic/ingenic_regs.h Fri Dec 10 20:36:03 2021
@@ -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*/
Index: src/sys/arch/sparc/dev/sxreg.h
diff -u src/sys/arch/sparc/dev/sxreg.h:1.20 src/sys/arch/sparc/dev/sxreg.h:1.21
--- src/sys/arch/sparc/dev/sxreg.h:1.20 Wed Dec 8 17:03:38 2021
+++ src/sys/arch/sparc/dev/sxreg.h Fri Dec 10 20:36:03 2021
@@ -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 */
Index: src/sys/arch/sparc64/dev/psmreg.h
diff -u src/sys/arch/sparc64/dev/psmreg.h:1.2 src/sys/arch/sparc64/dev/psmreg.h:1.3
--- src/sys/arch/sparc64/dev/psmreg.h:1.2 Thu Jun 30 20:09:36 2011
+++ src/sys/arch/sparc64/dev/psmreg.h Fri Dec 10 20:36:03 2021
@@ -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 */
Index: src/sys/arch/xen/xen/privcmd.c
diff -u src/sys/arch/xen/xen/privcmd.c:1.60 src/sys/arch/xen/xen/privcmd.c:1.61
--- src/sys/arch/xen/xen/privcmd.c:1.60 Mon Nov 30 17:06:02 2020
+++ src/sys/arch/xen/xen/privcmd.c Fri Dec 10 20:36:03 2021
@@ -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;
}
Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.3 src/sys/compat/common/compat_50_mod.c:1.4
--- src/sys/compat/common/compat_50_mod.c:1.3 Mon Apr 15 02:07:11 2019
+++ src/sys/compat/common/compat_50_mod.c Fri Dec 10 20:36:03 2021
@@ -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();
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.111 src/sys/dev/audio/audio.c:1.112
--- src/sys/dev/audio/audio.c:1.111 Sun Dec 5 02:56:55 2021
+++ src/sys/dev/audio/audio.c Fri Dec 10 20:36:03 2021
@@ -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_sof
* 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.
Index: src/sys/dev/hil/hil.c
diff -u src/sys/dev/hil/hil.c:1.5 src/sys/dev/hil/hil.c:1.6
--- src/sys/dev/hil/hil.c:1.5 Sat Aug 7 16:19:11 2021
+++ src/sys/dev/hil/hil.c Fri Dec 10 20:36:03 2021
@@ -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, u
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;
Index: src/sys/dev/ic/aacreg.h
diff -u src/sys/dev/ic/aacreg.h:1.13 src/sys/dev/ic/aacreg.h:1.14
--- src/sys/dev/ic/aacreg.h:1.13 Thu Oct 2 08:21:57 2008
+++ src/sys/dev/ic/aacreg.h Fri Dec 10 20:36:03 2021
@@ -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 */
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.107 src/sys/dev/ic/sl811hs.c:1.108
--- src/sys/dev/ic/sl811hs.c:1.107 Mon Aug 9 20:49:10 2021
+++ src/sys/dev/ic/sl811hs.c Fri Dec 10 20:36:03 2021
@@ -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
* 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.
Index: src/sys/dev/marvell/mvxpsec.c
diff -u src/sys/dev/marvell/mvxpsec.c:1.8 src/sys/dev/marvell/mvxpsec.c:1.9
--- src/sys/dev/marvell/mvxpsec.c:1.8 Fri Aug 13 20:26:07 2021
+++ src/sys/dev/marvell/mvxpsec.c Fri Dec 10 20:36:04 2021
@@ -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 *
/*
* 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
Index: src/sys/dev/pci/twa.c
diff -u src/sys/dev/pci/twa.c:1.60 src/sys/dev/pci/twa.c:1.61
--- src/sys/dev/pci/twa.c:1.60 Sat Aug 7 16:19:14 2021
+++ src/sys/dev/pci/twa.c Fri Dec 10 20:36:04 2021
@@ -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_
{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"},
Index: src/sys/dev/pci/cxgb/cxgb_t3_hw.c
diff -u src/sys/dev/pci/cxgb/cxgb_t3_hw.c:1.6 src/sys/dev/pci/cxgb/cxgb_t3_hw.c:1.7
--- src/sys/dev/pci/cxgb/cxgb_t3_hw.c:1.6 Wed Nov 10 17:19:30 2021
+++ src/sys/dev/pci/cxgb/cxgb_t3_hw.c Fri Dec 10 20:36:04 2021
@@ -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.
Index: src/sys/dev/raidframe/rf_reconstruct.h
diff -u src/sys/dev/raidframe/rf_reconstruct.h:1.30 src/sys/dev/raidframe/rf_reconstruct.h:1.31
--- src/sys/dev/raidframe/rf_reconstruct.h:1.30 Fri Jul 23 00:54:45 2021
+++ src/sys/dev/raidframe/rf_reconstruct.h Fri Dec 10 20:36:04 2021
@@ -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. */
Index: src/sys/fs/efs/efs_subr.c
diff -u src/sys/fs/efs/efs_subr.c:1.13 src/sys/fs/efs/efs_subr.c:1.14
--- src/sys/fs/efs/efs_subr.c:1.13 Mon Sep 7 00:11:47 2020
+++ src/sys/fs/efs/efs_subr.c Fri Dec 10 20:36:04 2021
@@ -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 <[email protected]>
@@ -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
Index: src/sys/kern/subr_interrupt.c
diff -u src/sys/kern/subr_interrupt.c:1.4 src/sys/kern/subr_interrupt.c:1.5
--- src/sys/kern/subr_interrupt.c:1.4 Sun Jan 28 22:24:58 2018
+++ src/sys/kern/subr_interrupt.c Fri Dec 10 20:36:04 2021
@@ -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 *ilsiz
/*
* 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
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.56 src/sys/kern/sys_select.c:1.57
--- src/sys/kern/sys_select.c:1.56 Wed Sep 29 02:47:22 2021
+++ src/sys/kern/sys_select.c Fri Dec 10 20:36:04 2021
@@ -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 *fd
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;
Index: src/sys/netinet/dccp_tfrc.c
diff -u src/sys/netinet/dccp_tfrc.c:1.8 src/sys/netinet/dccp_tfrc.c:1.9
--- src/sys/netinet/dccp_tfrc.c:1.8 Sun Dec 5 07:26:35 2021
+++ src/sys/netinet/dccp_tfrc.c Fri Dec 10 20:36:04 2021
@@ -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_cc
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 */
Index: src/sys/netinet/sctp_pcb.c
diff -u src/sys/netinet/sctp_pcb.c:1.22 src/sys/netinet/sctp_pcb.c:1.23
--- src/sys/netinet/sctp_pcb.c:1.22 Sun Sep 19 10:34:10 2021
+++ src/sys/netinet/sctp_pcb.c Fri Dec 10 20:36:04 2021
@@ -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 sct
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)) {
Index: src/sys/sys/timex.h
diff -u src/sys/sys/timex.h:1.18 src/sys/sys/timex.h:1.19
--- src/sys/sys/timex.h:1.18 Sun Apr 5 19:59:26 2009
+++ src/sys/sys/timex.h Fri Dec 10 20:36:04 2021
@@ -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) */
/*
Index: src/sys/ufs/chfs/chfs_readinode.c
diff -u src/sys/ufs/chfs/chfs_readinode.c:1.11 src/sys/ufs/chfs/chfs_readinode.c:1.12
--- src/sys/ufs/chfs/chfs_readinode.c:1.11 Thu Jul 15 22:39:06 2021
+++ src/sys/ufs/chfs/chfs_readinode.c Fri Dec 10 20:36:04 2021
@@ -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,
Index: src/tests/dev/audio/audiotest.c
diff -u src/tests/dev/audio/audiotest.c:1.17 src/tests/dev/audio/audiotest.c:1.18
--- src/tests/dev/audio/audiotest.c:1.17 Wed Dec 8 20:50:03 2021
+++ src/tests/dev/audio/audiotest.c Fri Dec 10 20:36:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audiotest.c,v 1.17 2021/12/08 20:50:03 andvar Exp $ */
+/* $NetBSD: audiotest.c,v 1.18 2021/12/10 20:36:05 andvar Exp $ */
/*
* Copyright (C) 2019 Tetsuya Isaki. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: audiotest.c,v 1.17 2021/12/08 20:50:03 andvar Exp $");
+__RCSID("$NetBSD: audiotest.c,v 1.18 2021/12/10 20:36:05 andvar Exp $");
#include <errno.h>
#include <fcntl.h>
@@ -6072,7 +6072,7 @@ DEF(AUDIO_GETENC_range)
memset(&expected, 0, sizeof(expected));
i = getenc_make_table(fd, expected);
- /* When error has occured, the next index should also occur error */
+ /* When error has occurred, the next index should also occur error */
ae.index = i + 1;
r = IOCTL(fd, AUDIO_GETENC, &ae, "index=%d", ae.index);
XP_SYS_NG(EINVAL, r);
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.45 src/tests/lib/libc/gen/t_siginfo.c:1.46
--- src/tests/lib/libc/gen/t_siginfo.c:1.45 Wed Jan 13 06:44:55 2021
+++ src/tests/lib/libc/gen/t_siginfo.c Fri Dec 10 20:36:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_siginfo.c,v 1.45 2021/01/13 06:44:55 skrll Exp $ */
+/* $NetBSD: t_siginfo.c,v 1.46 2021/12/10 20:36:05 andvar Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -435,7 +435,7 @@ sigbus_action(int signo, siginfo_t *info
#if defined(__i386__) || defined(__x86_64__)
atf_tc_expect_fail("x86 architecture does not correctly "
- "report the address where the unaligned access occured");
+ "report the address where the unaligned access occurred");
#endif
ATF_REQUIRE_EQ(info->si_addr, (volatile void *)addr);
