From: mglocker <mglocker@openbsd.org>
Date: Wed, 4 Sep 2024 07:54:51 +0000 (+0000)
Subject: Fix some spelling.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9593dc34da13a12012033a17061c846c208061c2;p=openbsd

Fix some spelling.

Input and ok jmc@, jsg@
---

diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c
index a40de920271..433db1be798 100644
--- a/sys/arch/amd64/amd64/trap.c
+++ b/sys/arch/amd64/amd64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.105 2024/02/21 15:53:07 deraadt Exp $	*/
+/*	$OpenBSD: trap.c,v 1.106 2024/09/04 07:54:51 mglocker Exp $	*/
 /*	$NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $	*/
 
 /*-
@@ -182,7 +182,7 @@ upageflttrap(struct trapframe *frame, uint64_t cr2)
 	int signal, sicode, error;
 
 	/*
-	 * If NX is not enabled, we cant distinguish between PROT_READ
+	 * If NX is not enabled, we can't distinguish between PROT_READ
 	 * and PROT_EXEC access, so try both.
 	 */
 	error = uvm_fault(&p->p_vmspace->vm_map, va, 0, access_type);
diff --git a/sys/arch/amd64/amd64/vmm_machdep.c b/sys/arch/amd64/amd64/vmm_machdep.c
index 7e87ccc7dd9..0e8e2a52645 100644
--- a/sys/arch/amd64/amd64/vmm_machdep.c
+++ b/sys/arch/amd64/amd64/vmm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm_machdep.c,v 1.34 2024/09/03 13:36:19 dv Exp $ */
+/* $OpenBSD: vmm_machdep.c,v 1.35 2024/09/04 07:54:51 mglocker Exp $ */
 /*
  * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -4181,7 +4181,8 @@ vcpu_run_vmx(struct vcpu *vcpu, struct vm_run_params *vrp)
 				break;
 			}
 			if (!(exitinfo & VMX_EXIT_INFO_HAVE_REASON)) {
-				printf("%s: cant read exit reason\n", __func__);
+				printf("%s: can't read exit reason\n",
+				    __func__);
 				ret = EINVAL;
 				break;
 			}
diff --git a/sys/arch/hppa/include/mplock.h b/sys/arch/hppa/include/mplock.h
index 87f01b205c1..44b55b692df 100644
--- a/sys/arch/hppa/include/mplock.h
+++ b/sys/arch/hppa/include/mplock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mplock.h,v 1.6 2024/07/03 01:36:50 jsg Exp $	*/
+/*	$OpenBSD: mplock.h,v 1.7 2024/09/04 07:54:51 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2004 Niklas Hallqvist.  All rights reserved.
@@ -29,7 +29,7 @@
 
 /*
  * Really simple spinlock implementation with recursive capabilities.
- * Correctness is paramount, no fancyness allowed.
+ * Correctness is paramount, no fanciness allowed.
  */
 
 #define	MPL_LOCKED	0
diff --git a/sys/arch/hppa/spmath/md.h b/sys/arch/hppa/spmath/md.h
index ac007eada1f..53e07d9d408 100644
--- a/sys/arch/hppa/spmath/md.h
+++ b/sys/arch/hppa/spmath/md.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md.h,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
+/*	$OpenBSD: md.h,v 1.8 2024/09/04 07:54:51 mglocker Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -17,7 +17,7 @@
 #include <sys/cdefs.h>
 
 /*****************************************************************
- * Muliply/Divide SFU Internal State                             *
+ * Multiply/Divide SFU Internal State                            *
  *****************************************************************/
 struct mdsfu_register {
     int rslt_hi,
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 73634e238ab..acba6dd5798 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.164 2023/12/13 15:57:22 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.165 2024/09/04 07:54:51 mglocker Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -121,7 +121,7 @@ upageflttrap(struct trapframe *frame, uint32_t cr2)
 
 	/*
 	 * cpu_pae is true if system has PAE + NX.
-	 * If NX is not enabled, we cant distinguish between PROT_READ
+	 * If NX is not enabled, we can't distinguish between PROT_READ
 	 * and PROT_EXEC access, so try both.
 	 */
 	error = uvm_fault(&p->p_vmspace->vm_map, va, 0, access_type);
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index 3e85e40adcf..d58ef84e592 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.62 2022/10/14 13:22:57 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.63 2024/09/04 07:54:51 mglocker Exp $ */
 /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
 
 /*
@@ -76,8 +76,8 @@
  * Mach writedisklabel logic seems to fail when no BSD label is found.
  *
  * Kernel handles disklabel in this way;
- *	- searchs BSD label at offset 64
- *	- if not found, searchs UniOS/ISI label at the end of block
+ *	- searches BSD label at offset 64
+ *	- if not found, searches UniOS/ISI label at the end of block
  *	- kernel can distinguish whether it was SunOS label or UniOS/ISI
  *	  label and understand both
  *	- kernel writes UniOS/ISI label combined with BSD label to update
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 80f0a7f1fcc..851630ccf6f 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.33 2023/01/04 09:34:26 jsg Exp $	*/
+/*	$OpenBSD: zs.c,v 1.34 2024/09/04 07:54:51 mglocker Exp $	*/
 /*	$NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $	*/
 
 /*
@@ -691,7 +691,7 @@ zs_set_modes(struct zs_chanstate *cs, int cflag)
 	/*
 	 * Make sure we don't enable hfc on a signal line we're ignoring.
 	 * As we enable CTS interrupts only if we have CRTSCTS or CDTRCTS,
-	 * this code also effectivly turns off ZSWR15_CTS_IE.
+	 * this code also effectively turns off ZSWR15_CTS_IE.
 	 *
 	 * Also, disable DCD interrupts if we've been told to ignore
 	 * the DCD pin. Happens on mac68k because the input line for
@@ -880,7 +880,7 @@ static int stdin, stdout;
  * (the video, better than CN_LOWPRI), and CN_HIGHPRI (pick me!)
  *
  * As the mac's a bit different, we do extra work here. We mainly check
- * to see if we have serial echo going on. Also chould check for default
+ * to see if we have serial echo going on. Also could check for default
  * speeds.
  */
 
diff --git a/sys/arch/powerpc/include/mplock.h b/sys/arch/powerpc/include/mplock.h
index 4a7c303d8bb..d305e390375 100644
--- a/sys/arch/powerpc/include/mplock.h
+++ b/sys/arch/powerpc/include/mplock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mplock.h,v 1.6 2024/04/03 19:30:59 gkoehler Exp $	*/
+/*	$OpenBSD: mplock.h,v 1.7 2024/09/04 07:54:51 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2004 Niklas Hallqvist.  All rights reserved.
@@ -32,7 +32,7 @@
 /*
  * __ppc_lock exists because pte_spill_r() can't use __mp_lock.
  * Really simple spinlock implementation with recursive capabilities.
- * Correctness is paramount, no fancyness allowed.
+ * Correctness is paramount, no fanciness allowed.
  */
 
 struct __ppc_lock {
diff --git a/sys/arch/riscv64/dev/plic.c b/sys/arch/riscv64/dev/plic.c
index 0a292c6dce4..14062e77f89 100644
--- a/sys/arch/riscv64/dev/plic.c
+++ b/sys/arch/riscv64/dev/plic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: plic.c,v 1.12 2024/01/26 19:20:00 kettenis Exp $	*/
+/*	$OpenBSD: plic.c,v 1.13 2024/09/04 07:54:51 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -292,7 +292,7 @@ plic_attach(struct device *parent, struct device *dev, void *aux)
 			plic_irq_handler, NULL, "plic0");
 
 	/*
-	 * From now on, spl update must be enforeced to plic, so
+	 * From now on, spl update must be enforced to plic, so
 	 * spl* routine should be updated.
 	 */
 	riscv_set_intr_func(plic_splraise, plic_spllower,
diff --git a/sys/arch/riscv64/riscv64/pmap.c b/sys/arch/riscv64/riscv64/pmap.c
index 259ba5bc774..67247ca7346 100644
--- a/sys/arch/riscv64/riscv64/pmap.c
+++ b/sys/arch/riscv64/riscv64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.41 2024/04/29 10:07:37 jsg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.42 2024/09/04 07:54:51 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Brian Bamsch <bbamsch@google.com>
@@ -276,7 +276,7 @@ VP_IDX3(vaddr_t va)
  * On RISC-V, the encodings for write permission without read
  * permission (r=0, w=1, x=0, or r=0, w=1, x=1) are reserved, so
  * PROT_WRITE implies PROT_READ.  We need to handle PROT_NONE
- * seperately (see pmap_pte_update()) since r=0, w=0, x=0 is reserved
+ * separately (see pmap_pte_update()) since r=0, w=0, x=0 is reserved
  * for non-leaf page table entries.
  */
 const pt_entry_t ap_bits_user[8] = {
diff --git a/sys/arch/sh/sh/interrupt.c b/sys/arch/sh/sh/interrupt.c
index 20c5bf4fabb..cbeab4fe653 100644
--- a/sys/arch/sh/sh/interrupt.c
+++ b/sys/arch/sh/sh/interrupt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interrupt.c,v 1.19 2024/06/26 01:40:49 jsg Exp $	*/
+/*	$OpenBSD: interrupt.c,v 1.20 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: interrupt.c,v 1.18 2006/01/25 00:02:57 uwe Exp $	*/
 
 /*-
@@ -366,7 +366,7 @@ intc_intr_priority(int evtcode, int level)
 }
 
 /*
- * Interrupt handler holder allocater.
+ * Interrupt handler holder allocator.
  */
 struct intc_intrhand *
 intc_alloc_ih(void)
diff --git a/sys/arch/sh/sh/vectors.S b/sys/arch/sh/sh/vectors.S
index 5c19b44a0ea..b602bd475a3 100644
--- a/sys/arch/sh/sh/vectors.S
+++ b/sys/arch/sh/sh/vectors.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vectors.S,v 1.9 2022/12/08 02:11:27 guenther Exp $	*/
+/*	$OpenBSD: vectors.S,v 1.10 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: exception_vector.S,v 1.19 2006/08/22 21:47:57 uwe Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 
 /*
  * Exception vectors.
- * The following routines are copied to vector addreses.
+ * The following routines are copied to vector addresses.
  *	sh_vector_generic:	VBR + 0x100
  *	sh_vector_tlbmiss:	VBR + 0x400
  *	sh_vector_interrupt:	VBR + 0x600
diff --git a/sys/arch/sparc64/dev/fb.c b/sys/arch/sparc64/dev/fb.c
index b24917a4b21..5bc26cad2cc 100644
--- a/sys/arch/sparc64/dev/fb.c
+++ b/sys/arch/sparc64/dev/fb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fb.c,v 1.30 2020/05/25 09:55:48 jsg Exp $	*/
+/*	$OpenBSD: fb.c,v 1.31 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
 
 /*
@@ -211,7 +211,7 @@ fbwscons_init(struct sunfb *sf, int flags, int isconsole)
 	 * switch from the 12x22 font to the more adequate 8x16 font
 	 * here.
 	 * If we are the console device, we need to adjust two things:
-	 * - the display row should be overrided from the current PROM
+	 * - the display row should be overridden from the current PROM
 	 *   metrics, since it will not match the PROM reality anymore.
 	 * - the screen needs to be cleared.
 	 *
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index b316823529b..2f5f92755a3 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.34 2024/03/29 21:17:13 miod Exp $	*/
+/*	$OpenBSD: zs.c,v 1.35 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -344,7 +344,7 @@ zs_attach(struct zsc_softc *zsc, struct zsdevice *zsd, int pri)
 		if ((zsc_args.hwflags & ZS_HWFLAG_CONSOLE_OUTPUT) != 0) {
 			zs_conschan_put = zc;
 		}
-		/* Childs need to set cn_dev, etc */
+		/* Children need to set cn_dev, etc */
 
 		cs->cs_reg_csr  = &zc->zc_csr;
 		cs->cs_reg_data = &zc->zc_data;
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index 76f50f60127..5edbd54b777 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.223 2024/04/14 19:08:09 miod Exp $	*/
+/*	$OpenBSD: locore.s,v 1.224 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $	*/
 
 /*
@@ -639,7 +639,7 @@ trapbase:
 	UTRAP 0x004		! 004 = SIR -- ROM should get this
 	UTRAP 0x005		! 005 = RED state exception
 	UTRAP 0x006; UTRAP 0x007
-	VTRAP T_INST_EXCEPT, textfault	! 008 = instr. access exept
+	VTRAP T_INST_EXCEPT, textfault	! 008 = instr. access except
 	VTRAP T_TEXTFAULT, textfault	! 009 = instr. access MMU miss
 	VTRAP T_INST_ERROR, textfault	! 00a = instr. access err
 	UTRAP 0x00b; UTRAP 0x00c; UTRAP 0x00d; UTRAP 0x00e; UTRAP 0x00f
@@ -799,7 +799,7 @@ trapbase_priv:
 	UTRAP 0x005		! 005 = RED state exception
 	UTRAP 0x006; UTRAP 0x007
 ktextfault:
-	VTRAP T_INST_EXCEPT, textfault	! 008 = instr. access exept
+	VTRAP T_INST_EXCEPT, textfault	! 008 = instr. access except
 	VTRAP T_TEXTFAULT, textfault	! 009 = instr. access MMU miss -- no MMU
 	VTRAP T_INST_ERROR, textfault	! 00a = instr. access err
 	UTRAP 0x00b; UTRAP 0x00c; UTRAP 0x00d; UTRAP 0x00e; UTRAP 0x00f
diff --git a/sys/arch/sparc64/stand/bootblk/bootblk.fth b/sys/arch/sparc64/stand/bootblk/bootblk.fth
index d5ecc50aca3..ba839fcea48 100644
--- a/sys/arch/sparc64/stand/bootblk/bootblk.fth
+++ b/sys/arch/sparc64/stand/bootblk/bootblk.fth
@@ -1,4 +1,4 @@
-\	$OpenBSD: bootblk.fth,v 1.10 2020/06/05 09:16:13 otto Exp $
+\	$OpenBSD: bootblk.fth,v 1.11 2024/09/04 07:54:52 mglocker Exp $
 \	$NetBSD: bootblk.fth,v 1.15 2015/08/20 05:40:08 dholland Exp $
 \
 \	IEEE 1275 Open Firmware Boot Block
@@ -308,7 +308,7 @@ defer if_daddr
 
 niaddr /w* constant narraysize
 
-\ Assume UFS2 dinodes are always biger than UFS1
+\ Assume UFS2 dinodes are always bigger than UFS1
 ufs2_dinode_SIZEOF buffer: cur-inode
 0 value indir-block
 create indir-addr -1 , -1 ,
@@ -431,7 +431,7 @@ create cur-blockno -1 l, -1 l,		\ Current disk block.
 : is-symlink? ( ufs1_dinode -- is-symlink? )	di-mode w@ ifmt and iflnk = ;
 
 \
-\ Multi-FS initialiation.
+\ Multi-FS initialization.
 \
 \ It's way down here so all the fs-specific routines have already been defined.
 \
diff --git a/sys/crypto/siphash.h b/sys/crypto/siphash.h
index fa12be2cc6a..980adeb166a 100644
--- a/sys/crypto/siphash.h
+++ b/sys/crypto/siphash.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: siphash.h,v 1.5 2015/02/20 11:51:03 tedu Exp $ */
+/* $OpenBSD: siphash.h,v 1.6 2024/09/04 07:54:52 mglocker Exp $ */
 /*-
  * Copyright (c) 2013 Andre Oppermann <andre@FreeBSD.org>
  * All rights reserved.
@@ -35,7 +35,7 @@
  * optimized for speed on short messages returning a 64bit hash/digest value.
  *
  * The number of rounds is defined during the initialization:
- *  SipHash24_Init() for the fast and resonable strong version
+ *  SipHash24_Init() for the fast and reasonably strong version
  *  SipHash48_Init() for the strong version (half as fast)
  *
  * struct SIPHASH_CTX ctx;
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 2eeb1835b4f..6b9281bbf73 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_elf.c,v 1.32 2021/03/12 10:22:46 jsg Exp $	*/
+/*	$OpenBSD: db_elf.c,v 1.33 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $	*/
 
 /*-
@@ -280,7 +280,7 @@ db_elf_sym_search(vaddr_t off, db_strategy_t strategy, db_expr_t *diffp)
 		if (symp->st_name == 0)
 			continue;
 #if 0
-		/* This prevents me from seeing anythin in locore.s -- eeh */
+		/* This prevents me from seeing anything in locore.s -- eeh */
 		if (ELF_SYM_TYPE(symp->st_info) != Elf_estt_object &&
 		    ELF_SYM_TYPE(symp->st_info) != Elf_estt_func)
 			continue;
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c
index d4baa8452a9..a3d0e374a06 100644
--- a/sys/dev/acpi/atk0110.c
+++ b/sys/dev/acpi/atk0110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atk0110.c,v 1.19 2022/04/06 18:59:27 naddy Exp $	*/
+/*	$OpenBSD: atk0110.c,v 1.20 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -215,7 +215,7 @@ aibs_attach_sif(struct aibs_softc *sc, enum sensor_type st)
 		aml_freevalue(&res);
 		return;
 	} else if (res.length - 1 > n) {
-		printf("%s: %s: misformed package: %i/%i",
+		printf("%s: %s: malformed package: %i/%i",
 		    DEVNAME(sc), name, n, res.length - 1);
 #ifdef AIBS_MORE_SENSORS
 		n = res.length - 1;
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 24d60fedfc2..b2e5e9e0f2d 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.155 2024/05/26 10:01:01 jsg Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.156 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -418,7 +418,7 @@ atascsi_probe(struct scsi_link *link)
 	xa->pmp_port = ap->ap_pmp_port;
 	xa->atascsi_private = &ahp->ahp_iopool;
 	ata_exec(as, xa);
-	ata_polled(xa); /* we dont care if it doesnt work */
+	ata_polled(xa); /* we don't care if it doesn't work */
 
 	return (0);
 error:
@@ -1797,7 +1797,7 @@ ata_polled(struct ata_xfer *xa)
 	int			rv;
 
 	if (!ISSET(xa->flags, ATA_F_DONE))
-		panic("ata_polled: xa isnt complete");
+		panic("ata_polled: xa isn't complete");
 
 	switch (xa->state) {
 	case ATA_S_COMPLETE:
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index b3346d25738..7dcc560a302 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.45 2024/05/24 06:26:47 jsg Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.46 2024/09/04 07:54:52 mglocker Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -36,7 +36,7 @@
 /* This is a driver for CardBus based serial devices. It is less
    generic than it could be, but it keeps the complexity down. So far
    it assumes that anything that reports itself as a `serial' device
-   is infact a 16x50 or 8250, which is not necessarily true (in
+   is in fact a 16x50 or 8250, which is not necessarily true (in
    practice this shouldn't be a problem). It also does not handle
    devices in the `multiport serial' or `modem' sub-classes, I've
    never seen any of these, so I don't know what they might look like.
diff --git a/sys/dev/i2c/i2c_scan.c b/sys/dev/i2c/i2c_scan.c
index d39271383d9..0218cd84638 100644
--- a/sys/dev/i2c/i2c_scan.c
+++ b/sys/dev/i2c/i2c_scan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2c_scan.c,v 1.146 2019/12/16 19:17:04 claudio Exp $	*/
+/*	$OpenBSD: i2c_scan.c,v 1.147 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt <deraadt@openbsd.org>
@@ -657,7 +657,7 @@ iic_probe_sensor(struct device *self, u_int8_t addr)
 		    (iicprobe(0x03) & 0x3f) == 0x00 && iicprobe(0x04) <= 0x08)
 			/*
 			 * Genesys Logic doesn't make the datasheet
-			 * for the GL523SM publically available, so
+			 * for the GL523SM publicly available, so
 			 * the checks above are nothing more than a
 			 * (conservative) educated guess.
 			 */
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c
index 0f7ac5decd5..bd3fdbe7c28 100644
--- a/sys/dev/ic/ahci.c
+++ b/sys/dev/ic/ahci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci.c,v 1.41 2024/05/28 01:37:53 jsg Exp $ */
+/*	$OpenBSD: ahci.c,v 1.42 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -268,7 +268,7 @@ noccc:
 	sc->sc_ncmds = max(2, sc->sc_ncmds);
 	for (i = 0; i < AHCI_MAX_PORTS; i++) {
 		if (!ISSET(pi, 1U << i)) {
-			/* dont allocate stuff if the port isnt implemented */
+			/* don't allocate stuff if the port isn't implemented */
 			continue;
 		}
 
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index f1b294333a8..d5890725c07 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.40 2022/04/16 19:19:58 naddy Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.41 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -69,7 +69,7 @@
  */
 
 /* Use doubleword transfers to/from SCSI chip.  Note: This requires
- * motherboard support.  Basicly, some motherboard chipsets are able to
+ * motherboard support.  Basically, some motherboard chipsets are able to
  * split a 32 bit I/O operation into two 16 bit I/O operations,
  * transparently to the processor.  This speeds up some things, notably long
  * data transfers.
diff --git a/sys/dev/ic/aic6360var.h b/sys/dev/ic/aic6360var.h
index 3ee5ff8dd69..0ba60af7a3b 100644
--- a/sys/dev/ic/aic6360var.h
+++ b/sys/dev/ic/aic6360var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360var.h,v 1.10 2020/07/22 13:16:04 krw Exp $	*/
+/*	$OpenBSD: aic6360var.h,v 1.11 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct aic_dma_seg {
 /*
  * ACB. Holds additional information for each SCSI command Comments: We
  * need a separate scsi command block because we may need to overwrite it
- * with a request sense command.  Basicly, we refrain from fiddling with
+ * with a request sense command.  Basically, we refrain from fiddling with
  * the scsi_xfer struct (except do the expected updating of return values).
  * We'll generally update: xs->{flags,resid,error,sense,status} and
  * occasionally xs->retries.
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 6ad091f3aa8..e4fab4b96a3 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.c,v 1.68 2024/09/01 03:08:56 jsg Exp $	*/
+/*	$OpenBSD: aic79xx.c,v 1.69 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -1624,7 +1624,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd, u_int intstat)
 		 * 'Selection in Progress' status bit, the busy
 		 * LED does.  SELINGO is only cleared by a successful
 		 * selection, so we must manually clear it to insure
-		 * the LED turns off just incase no future successful
+		 * the LED turns off just in case no future successful
 		 * selections occur (e.g. no devices on the bus).
 		 */
 		ahd_outb(ahd, CLRSINT0, CLRSELINGO);
diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h
index 250ac9f15cf..03d6af31d34 100644
--- a/sys/dev/ic/aic79xx.h
+++ b/sys/dev/ic/aic79xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.h,v 1.32 2024/09/01 03:08:56 jsg Exp $	*/
+/*	$OpenBSD: aic79xx.h,v 1.33 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -831,8 +831,8 @@ struct seeprom_config {
  * BIOS Control Bits
  */
 	uint16_t bios_control;		/* word 16 */
-#define		CFSUPREM	0x0001	/* support all removeable drives */
-#define		CFSUPREMB	0x0002	/* support removeable boot drives */
+#define		CFSUPREM	0x0001	/* support all removable drives */
+#define		CFSUPREMB	0x0002	/* support removable boot drives */
 #define		CFBIOSSTATE	0x000C	/* BIOS Action State */
 #define		    CFBS_DISABLED	0x00
 #define		    CFBS_ENABLED	0x04
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 128902d1a59..de5f4529c57 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.97 2022/01/09 05:42:38 jsg Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.98 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.97 2022/01/09 05:42:38 jsg Exp $
+ * $Id: aic7xxx.c,v 1.98 2024/09/04 07:54:52 mglocker Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -1199,7 +1199,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
 		 * 'Selection in Progress' status bit, the busy
 		 * LED does.  SELINGO is only cleared by a successful
 		 * selection, so we must manually clear it to insure
-		 * the LED turns off just incase no future successful
+		 * the LED turns off just in case no future successful
 		 * selections occur (e.g. no devices on the bus).
 		 */
 		ahc_outb(ahc, CLRSINT0, CLRSELINGO);
diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h
index f31f71487b2..5a2845e92cb 100644
--- a/sys/dev/ic/atwvar.h
+++ b/sys/dev/ic/atwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atwvar.h,v 1.26 2013/12/06 21:03:02 deraadt Exp $	*/
+/*	$OpenBSD: atwvar.h,v 1.27 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: atwvar.h,v 1.13 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
 #include <sys/timeout.h>
 
 /*
- * Some misc. statics, useful for debugging.
+ * Some misc. statistics, useful for debugging.
  */
 struct atw_stats {
 	u_long		ts_tx_tuf;	/* transmit underflow errors */
diff --git a/sys/dev/ic/fxpreg.h b/sys/dev/ic/fxpreg.h
index ccae328a1ee..0996e2b7eef 100644
--- a/sys/dev/ic/fxpreg.h
+++ b/sys/dev/ic/fxpreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxpreg.h,v 1.14 2012/04/03 23:39:09 deraadt Exp $	*/
+/*	$OpenBSD: fxpreg.h,v 1.15 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -121,7 +121,7 @@ struct fxp_cb_ias {
  *  Bitfields cleaned out since it is not endian compatible. OK
  *  you can define a big endian structure but can never be 100% safe...
  *
- *  ANY PROGRAMER TRYING THE STUNT WITH BITFIELDS IN A DEVICE DRIVER
+ *  ANY PROGRAMMER TRYING THE STUNT WITH BITFIELDS IN A DEVICE DRIVER
  *  SHOULD BE PUT UP AGAINST THE WALL, BLINDFOLDED AND SHOT!
  */
 struct fxp_cb_config {
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index e4847c98e55..f08f6bb305e 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gemvar.h,v 1.32 2024/05/13 01:15:50 jsg Exp $	*/
+/*	$OpenBSD: gemvar.h,v 1.33 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: gemvar.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -106,7 +106,7 @@ struct gem_txthresh_tab {
 };
 
 /*
- * Some misc. statics, useful for debugging.
+ * Some misc. statistics, useful for debugging.
  */
 struct gem_stats {
 	u_long		ts_tx_uf;	/* transmit underflow errors */
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index 03fbe50aee3..cc6dbac4439 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9xvar.h,v 1.25 2024/04/03 18:41:38 miod Exp $	*/
+/*	$OpenBSD: ncr53c9xvar.h,v 1.26 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: ncr53c9xvar.h,v 1.13 1998/05/26 23:17:34 thorpej Exp $	*/
 
 /*-
@@ -88,7 +88,7 @@
 /*
  * ECB. Holds additional information for each SCSI command Comments: We
  * need a separate scsi command block because we may need to overwrite it
- * with a request sense command.  Basicly, we refrain from fiddling with
+ * with a request sense command.  Basically, we refrain from fiddling with
  * the scsi_xfer struct (except do the expected updating of return values).
  * We'll generally update: xs->{flags,resid,error,sense,status} and
  * occasionally xs->retries.
diff --git a/sys/dev/ic/osiopvar.h b/sys/dev/ic/osiopvar.h
index f776702212d..954311cb53e 100644
--- a/sys/dev/ic/osiopvar.h
+++ b/sys/dev/ic/osiopvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiopvar.h,v 1.12 2020/07/22 13:16:04 krw Exp $	*/
+/*	$OpenBSD: osiopvar.h,v 1.13 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: osiopvar.h,v 1.3 2002/05/14 02:58:35 matt Exp $	*/
 
 /*
@@ -133,7 +133,7 @@ struct osiop_ds {
 
 /*
  * ACB. Holds additional information for each SCSI command Comments:
- * Basicly, we refrain from fiddling with the scsi_xfer struct
+ * Basically, we refrain from fiddling with the scsi_xfer struct
  * (except do the expected updating of return values).
  * We'll generally update: xs->{flags,resid,error,status} and
  * occasionally xs->retries.
diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c
index 82d57e3a9b8..c40c648997c 100644
--- a/sys/dev/ic/sili.c
+++ b/sys/dev/ic/sili.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sili.c,v 1.61 2022/04/09 20:10:26 naddy Exp $ */
+/*	$OpenBSD: sili.c,v 1.62 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -123,7 +123,7 @@ void			sili_ports_free(struct sili_softc *);
 
 /*
  * you can fit 22 sge's into 7 sgts and a prb:
- * there's 1 sgl in an atapi prb (two in the ata one, but we cant over
+ * there's 1 sgl in an atapi prb (two in the ata one, but we can't over
  * advertise), but that's needed for the chain element. you get three sges
  * per sgt cos you lose the 4th sge for the chaining, but you keep it in
  * the last sgt. so 3 x 6 + 4 is 22.
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index c8ca7842c9c..5e78a9da0b5 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.c,v 1.46 2024/06/22 10:22:29 jsg Exp $
+/*	$OpenBSD: trm.c,v 1.47 2024/09/04 07:54:52 mglocker Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.c
@@ -1124,7 +1124,7 @@ trm_DataInPhase0(struct trm_softc *sc, struct trm_scsi_req_q *pSRB, u_int8_t *ps
 			 *
 			 * parsing the case:
 			 * when a transfer not yet complete
-			 * but be disconnected by uper layer
+			 * but be disconnected by upper layer
 			 * if transfer not yet complete
 			 * there were some data residue in SCSI FIFO or
 			 * SCSI transfer counter not empty
diff --git a/sys/dev/ic/trm.h b/sys/dev/ic/trm.h
index 42f607ee33d..3f0bf34d651 100644
--- a/sys/dev/ic/trm.h
+++ b/sys/dev/ic/trm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm.h,v 1.7 2020/07/22 13:16:04 krw Exp $
+/*	$OpenBSD: trm.h,v 1.8 2024/09/04 07:54:52 mglocker Exp $
  * ------------------------------------------------------------
  *   O.S       : OpenBSD
  *   File Name : trm.h
@@ -123,7 +123,7 @@ struct trm_scsi_req_q
 #define TRM_NO_TAG                  0x00
 
 	u_int8_t	TargetStatus;	    /* SCSI status codes + Tekram: */
-#define TRM_SCSI_UNEXP_BUS_FREE     0xFD    /*    Unexpect Bus Free        */
+#define TRM_SCSI_UNEXP_BUS_FREE     0xFD    /*    Unexpected Bus Free      */
 #define TRM_SCSI_BUS_RST_DETECTED   0xFE    /*    Scsi Bus Reset detected  */
 #define TRM_SCSI_SELECT_TIMEOUT     0xFF    /*    Selection Time out       */
 
diff --git a/sys/dev/kstat.c b/sys/dev/kstat.c
index 5b41743395e..6ad423d1919 100644
--- a/sys/dev/kstat.c
+++ b/sys/dev/kstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kstat.c,v 1.3 2024/07/08 14:46:47 mpi Exp $ */
+/* $OpenBSD: kstat.c,v 1.4 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2020 David Gwynne <dlg@openbsd.org>
@@ -252,7 +252,7 @@ kstatioc_leave(struct kstat_req *ksreq, struct kstat *ks)
 
 			/* KSTAT_F_REALLOC */
 			KASSERTMSG(ks->ks_datalen == klen,
-			    "kstat doesnt support resized data yet");
+			    "kstat doesn't support resized data yet");
 
 			error = (*ks->ks_copy)(ks, buf);
 		}
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index c0ba8a18dc4..e15fcae7b74 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.126 2024/05/24 06:02:53 jsg Exp $ */
+/*	$OpenBSD: arc.c,v 1.127 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -2219,7 +2219,7 @@ arc_bio_disk(struct arc_softc *sc, struct bioc_disk *bd)
 	bd->bd_lun = diskinfo->scsi_attr.lun;
 #endif
 	/*
-	 * the firmware doesnt seem to fill scsi_attr in, so fake it with
+	 * the firmware doesn't seem to fill scsi_attr in, so fake it with
 	 * the diskid.
 	 */
 	bd->bd_channel = 0;
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 78de2a46fa8..1cafe27777f 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.119 2022/10/26 20:19:08 kn Exp $	*/
+/*	$OpenBSD: auich.c,v 1.120 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -1422,7 +1422,7 @@ auich_calibrate(struct auich_softc *sc)
 			break;
 		/*
 		 * check for strange changes in STS -
-		 * XXX remove it when everythings fine
+		 * XXX remove it when everything is fine
 		 */
 		if (sts != osts) {
 			printf("%s: ac97 sts changed after %d us sts=%b civ=%u\n",
diff --git a/sys/dev/pci/bktr/bktr_audio.c b/sys/dev/pci/bktr/bktr_audio.c
index 8c1926489a5..127a420fbb7 100644
--- a/sys/dev/pci/bktr/bktr_audio.c
+++ b/sys/dev/pci/bktr/bktr_audio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_audio.c,v 1.14 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: bktr_audio.c,v 1.15 2024/09/04 07:54:52 mglocker Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp $ */
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -267,7 +267,7 @@ init_BTSC( bktr_ptr_t bktr )
 
 /*
  * setup the dbx chip
- * XXX FIXME: alot of work to be done here, this merely unmutes it.
+ * XXX FIXME: a lot of work to be done here, this merely unmutes it.
  */
 int
 set_BTSC( bktr_ptr_t bktr, int control )
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index 6cc788be479..44e4a3453d0 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_pci.c,v 1.16 2024/05/24 06:02:53 jsg Exp $ */
+/*	$OpenBSD: i82365_pci.c,v 1.17 2024/09/04 07:54:52 mglocker Exp $ */
 /*	$NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $	*/
 
 /*
@@ -170,7 +170,8 @@ pcic_pci_attach(struct device *parent, struct device *self, void *aux)
 	if (irq) {
 		sc->ih = pcic_pci_machdep_pcic_intr_establish(sc, pcic_intr);
 		if (sc->ih == NULL) {
-			printf("%s: couldnt map interrupt\n", sc->dev.dv_xname);
+			printf("%s: couldn't map interrupt\n",
+			    sc->dev.dv_xname);
 			bus_space_unmap(memt, memh, 0x10000);
 			bus_space_unmap(sc->iot, sc->ioh, size);
 			return;
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 1fc28a9adbf..5b022a8bf67 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.406 2024/08/31 16:23:09 deraadt Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.407 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -1364,7 +1364,7 @@ bge_fill_rx_ring_std(struct bge_softc *sc)
 		bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, sc->bge_std);
 
 	/*
-	 * bge always needs more than 8 packets on the ring. if we cant do
+	 * bge always needs more than 8 packets on the ring. if we can't do
 	 * that now, then try again later.
 	 */
 	if (if_rxr_inuse(&sc->bge_std_ring) <= 8)
@@ -1468,7 +1468,7 @@ bge_fill_rx_ring_jumbo(struct bge_softc *sc)
 		bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, sc->bge_jumbo);
 
 	/*
-	 * bge always needs more than 8 packets on the ring. if we cant do
+	 * bge always needs more than 8 packets on the ring. if we can't do
 	 * that now, then try again later.
 	 */
 	if (if_rxr_inuse(&sc->bge_jumbo_ring) <= 8)
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 0ecadf3bf32..ff731d66cb9 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_devar.h,v 1.41 2022/03/11 18:00:45 mpi Exp $	*/
+/*	$OpenBSD: if_devar.h,v 1.42 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $	*/
 
 /*-
@@ -750,7 +750,7 @@ static const struct {
 
 /*
  * This driver supports a maximum of 32 tulip boards.
- * This should be enough for the forseeable future.
+ * This should be enough for the foreseeable future.
  */
 #define	TULIP_MAX_DEVICES	32
 
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 2ce546e5c4d..1636492661b 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.122 2024/06/26 01:40:49 jsg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.123 2024/09/04 07:54:52 mglocker Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -3039,7 +3039,7 @@ em_copper_link_rtl8211_setup(struct em_hw *hw)
 		return ret_val;
 	}
 
-	/* pulse streching= 42-84ms, blink rate=84mm */
+	/* pulse stretching= 42-84ms, blink rate=84mm */
 	phy_data = 0x140 | RGEPHY_LC_PULSE_42MS | RGEPHY_LC_LINK | 
 	    RGEPHY_LC_DUPLEX | RGEPHY_LC_RX;
 
@@ -4271,7 +4271,7 @@ em_check_for_link(struct em_hw *hw)
 	ctrl = E1000_READ_REG(hw, CTRL);
 	status = E1000_READ_REG(hw, STATUS);
 	/*
-	 * On adapters with a MAC newer than 82544, SW Defineable pin 1 will
+	 * On adapters with a MAC newer than 82544, SW Definable pin 1 will
 	 * be set when the optics detect a signal. On older adapters, it will
 	 * be cleared when there is a signal.  This applies to fiber media
 	 * only.
diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h
index efdf51f643f..42b1a53eadc 100644
--- a/sys/dev/pci/if_em_hw.h
+++ b/sys/dev/pci/if_em_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.h,v 1.96 2024/09/01 03:08:56 jsg Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.97 2024/09/04 07:54:52 mglocker Exp $ */
 /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
 
 /* if_em_hw.h
@@ -1672,12 +1672,12 @@ struct em_hw {
 #define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
 #define E1000_CTRL_EXT_LPCD      0x00000004 /* LCD Power Cycle Done */
 #define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Defineable Pin 4 */
-#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Defineable Pin 5 */
+#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Definable Pin 4 */
+#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Definable Pin 5 */
 #define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Defineable Pin 6 */
-#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */
-#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Defineable Pin 3 */
+#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Definable Pin 6 */
+#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Definable Pin 7 */
+#define E1000_CTRL_EXT_SDP3_DATA 0x00000080 /* Value of SW Definable Pin 3 */
 #define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
 #define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
 #define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 1c0517d6b0c..0d6ac83bd9f 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.216 2024/08/31 16:23:09 deraadt Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.217 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /******************************************************************************
 
@@ -2697,7 +2697,7 @@ ixgbe_get_buf(struct ix_rxring *rxr, int i)
 		return (ENOBUFS);
 	}
 
-	/* needed in any case so prealocate since this one will fail for sure */
+	/* needed in any case so preallocate since this one will fail for sure */
 	mp = MCLGETL(NULL, M_DONTWAIT, sc->rx_mbuf_sz);
 	if (!mp)
 		return (ENOBUFS);
diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c
index 8e39c29691b..b28467d9a5c 100644
--- a/sys/dev/pci/if_nxe.c
+++ b/sys/dev/pci/if_nxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nxe.c,v 1.81 2024/05/24 06:02:56 jsg Exp $ */
+/*	$OpenBSD: if_nxe.c,v 1.82 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -2077,7 +2077,7 @@ nxe_crb_set(struct nxe_softc *sc, int window)
 		nxe_write(sc, NXE_WIN_CRB(sc->sc_function), r);
 
 		if (nxe_read(sc, NXE_WIN_CRB(sc->sc_function)) != r)
-			printf("%s: crb window hasnt moved\n", DEVNAME(sc));
+			printf("%s: crb window hasn't moved\n", DEVNAME(sc));
 	}
 
 	return (oldwindow);
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 539f8917c9e..de6a448b97a 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.198 2024/08/31 16:23:09 deraadt Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.199 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -2271,7 +2271,7 @@ sk_init(void *xsc_if)
 	 * transmit command due to CPU/cache related interim storage problems
 	 * under certain conditions. The document recommends a polling
 	 * mechanism to send a Start transmit command to initiate transfer
-	 * of ready descriptors regulary. To cope with this issue sk(4) now
+	 * of ready descriptors regularly. To cope with this issue sk(4) now
 	 * enables descriptor poll timer to initiate descriptor processing
 	 * periodically as defined by SK_DPT_TIMER_MAX. However sk(4) still
 	 * issue SK_TXBMU_TX_START to Tx BMU to get fast execution of Tx
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index 17f51a5a4b3..bc0e28398a9 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tht.c,v 1.148 2024/05/24 06:02:57 jsg Exp $ */
+/*	$OpenBSD: if_tht.c,v 1.149 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -260,7 +260,7 @@ int thtdebug = THT_D_TX | THT_D_RX | THT_D_INTR;
 #define THT_FIFO_GAP		8 /* keep 8 bytes between ptrs */
 #define THT_FIFO_PTR_MASK	0x00007ff8 /* rptr/wptr mask */
 
-#define THT_FIFO_DESC_LEN	208 /* a descriptor cant be bigger than this */
+#define THT_FIFO_DESC_LEN	208 /* a descriptor can't be bigger than this */
 
 #define THT_IMR_DOWN(_p)	(THT_REG_IMR_LINKCHG(_p))
 #define THT_IMR_UP(_p)		(THT_REG_IMR_LINKCHG(_p) | \
@@ -1034,7 +1034,7 @@ tht_iff(struct tht_softc *sc)
 		}
 #endif
 
-		/* fill the imperfect multicast filter with whats left */
+		/* fill the imperfect multicast filter with what's left */
 		while (enm != NULL) {
 			hash = 0x00;
 			for (i = 0; i < ETHER_ADDR_LEN; i++)
diff --git a/sys/dev/pci/ixgbe_type.h b/sys/dev/pci/ixgbe_type.h
index edc569b94a6..589daf8751b 100644
--- a/sys/dev/pci/ixgbe_type.h
+++ b/sys/dev/pci/ixgbe_type.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ixgbe_type.h,v 1.38 2023/08/15 08:27:30 miod Exp $	*/
+/*	$OpenBSD: ixgbe_type.h,v 1.39 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /******************************************************************************
   SPDX-License-Identifier: BSD-3-Clause
@@ -306,7 +306,7 @@
 #define NVM_VER_INVALID		0xFFFF
 #define NVM_ETK_VALID		0x8000
 #define NVM_INVALID_PTR		0xFFFF
-#define NVM_VER_SIZE		32    /* version sting size */
+#define NVM_VER_SIZE		32    /* version string size */
 
 struct ixgbe_nvm_version {
 	uint32_t etk_id;
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index f0a8a2a09fb..f87067e5e56 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maestro.c,v 1.54 2024/08/18 20:28:41 deraadt Exp $	*/
+/*	$OpenBSD: maestro.c,v 1.55 2024/09/04 07:54:52 mglocker Exp $	*/
 /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
 /*
  * FreeBSD's ESS Agogo/Maestro driver 
@@ -991,7 +991,7 @@ maestro_open(void *hdl, int flags)
 	if ((flags & (FWRITE | FREAD)) == (FWRITE | FREAD))
 		return ENXIO;	/* XXX */
 
-/* XXX work around VM brokeness */
+/* XXX work around VM brokenness */
 #if 0
 	if ((OFLAGS(flags) & O_ACCMODE) != O_WRONLY)
 		return (EINVAL);
diff --git a/sys/dev/pci/qla_pci.c b/sys/dev/pci/qla_pci.c
index 94aa95b8da8..75c10eb0a81 100644
--- a/sys/dev/pci/qla_pci.c
+++ b/sys/dev/pci/qla_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla_pci.c,v 1.10 2024/05/24 06:02:58 jsg Exp $ */
+/*	$OpenBSD: qla_pci.c,v 1.11 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -217,7 +217,7 @@ qla_pci_detach(struct device *self, int flags)
 	int rv;
 
 	if (psc->psc_ih == NULL) {
-		/* we didnt attach properly, so nothing to detach */
+		/* we didn't attach properly, so nothing to detach */
 		return (0);
 	}
 
diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c
index 152154ce23a..67e04161490 100644
--- a/sys/dev/pci/qle.c
+++ b/sys/dev/pci/qle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qle.c,v 1.65 2024/05/24 06:02:58 jsg Exp $ */
+/*	$OpenBSD: qle.c,v 1.66 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -691,7 +691,7 @@ qle_detach(struct device *self, int flags)
 	struct qle_softc *sc = (struct qle_softc *)self;
 
 	if (sc->sc_ih == NULL) {
-		/* we didnt attach properly, so nothing to detach */
+		/* we didn't attach properly, so nothing to detach */
 		return (0);
 	}
 
diff --git a/sys/dev/pci/qlw_pci.c b/sys/dev/pci/qlw_pci.c
index 9ed90d8343d..45cdcdbb264 100644
--- a/sys/dev/pci/qlw_pci.c
+++ b/sys/dev/pci/qlw_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw_pci.c,v 1.13 2024/05/24 06:02:58 jsg Exp $ */
+/*	$OpenBSD: qlw_pci.c,v 1.14 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -302,7 +302,7 @@ qlw_pci_detach(struct device *self, int flags)
 	int rv;
 
 	if (psc->psc_ih == NULL) {
-		/* we didnt attach properly, so nothing to detach */
+		/* we didn't attach properly, so nothing to detach */
 		return (0);
 	}
 
diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c
index 5b37a807e15..6ac67d1db4a 100644
--- a/sys/dev/pci/vmwpvs.c
+++ b/sys/dev/pci/vmwpvs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmwpvs.c,v 1.28 2024/05/24 06:02:58 jsg Exp $ */
+/*	$OpenBSD: vmwpvs.c,v 1.29 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
@@ -499,7 +499,7 @@ vmwpvs_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_ccbs = mallocarray(r, sizeof(struct vmwpvs_ccb),
 	    M_DEVBUF, M_WAITOK);
-	/* cant fail */
+	/* can't fail */
 
 	sgls = VMWPVS_DMA_KVA(sc->sc_sgls);
 	sense = VMWPVS_DMA_KVA(sc->sc_sense);
diff --git a/sys/dev/pv/xenreg.h b/sys/dev/pv/xenreg.h
index e398f89be06..a9a24ee2d6a 100644
--- a/sys/dev/pv/xenreg.h
+++ b/sys/dev/pv/xenreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xenreg.h,v 1.11 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: xenreg.h,v 1.12 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -534,7 +534,7 @@ struct evtchn_unmask {
 };
 
 /*
- * Superceded by new event_channel_op() hypercall since 0x00030202.
+ * Superseded by new event_channel_op() hypercall since 0x00030202.
  */
 struct evtchn_op {
 	uint32_t cmd;		/* EVTCHNOP_* */
diff --git a/sys/dev/sbus/uperf_sbusreg.h b/sys/dev/sbus/uperf_sbusreg.h
index 5a5a94a7a5a..461a1625617 100644
--- a/sys/dev/sbus/uperf_sbusreg.h
+++ b/sys/dev/sbus/uperf_sbusreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf_sbusreg.h,v 1.3 2003/06/02 18:32:41 jason Exp $	*/
+/*	$OpenBSD: uperf_sbusreg.h,v 1.4 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -174,7 +174,7 @@
 #define	USC_MEM0_MRE	0x01000000	/* missed refresh error */
 #define	USC_MEM0_RPMC	0x00800000	/* RAS Phi 0 cookie for refresh */
 #define	USC_MEM0_RWMC	0x00400000	/* RAS Phi 0 cookie for writers */
-#define	USC_MEM0_SW0	0x001f0000	/* strecth count for first write */
+#define	USC_MEM0_SW0	0x001f0000	/* stretch count for first write */
 #define	USC_MEM0_SP	0x00000f00	/* simm present mask */
 #define	USC_MEM0_REFI	0x000000ff	/* refresh interval */
 
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 4ee709ba493..6a4ee614aa2 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.143 2024/05/23 03:21:08 jsg Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.144 2024/09/04 07:54:52 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -305,7 +305,7 @@ axe_miibus_readreg(struct device *dev, int phy, int reg)
 		/*
 		* BMSR of AX88772 indicates that it supports extended
 		* capability but the extended status register is
-		* revered for embedded ethernet PHY. So clear the
+		* reserved for embedded ethernet PHY. So clear the
 		* extended capability bit of BMSR.
 		*/
 		ival &= ~BMSR_EXTCAP;
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 662a0aba2d4..395bc257623 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.132 2024/08/18 02:59:51 deraadt Exp $	*/
+/*	$OpenBSD: usb.c,v 1.133 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -260,7 +260,7 @@ usb_detach_roothub(struct usb_softc *sc)
 	sc->sc_bus->flags |= USB_BUS_DISCONNECTING;
 	/*
 	 * Reset the dying flag in case it has been set by the interrupt
-	 * handler when unplugging an HC card otherwise the task wont be
+	 * handler when unplugging an HC card otherwise the task won't be
 	 * scheduled.  This is safe since a dead HC should not trigger
 	 * new interrupt.
 	 */
diff --git a/sys/dev/usb/xhcireg.h b/sys/dev/usb/xhcireg.h
index 8546849547d..177e293a12f 100644
--- a/sys/dev/usb/xhcireg.h
+++ b/sys/dev/usb/xhcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhcireg.h,v 1.19 2024/04/23 04:12:53 jsg Exp $ */
+/* $OpenBSD: xhcireg.h,v 1.20 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*-
  * Copyright (c) 2014 Martin Pieuchot. All rights reserved.
@@ -65,12 +65,12 @@
 #define XHCI_HCIVERSION_0_9	0x0090	/* xHCI version 0.9 */
 #define XHCI_HCIVERSION_1_0	0x0100	/* xHCI version 1.0 */
 
-#define XHCI_HCSPARAMS1		0x04	/* RO structual parameters 1 */
+#define XHCI_HCSPARAMS1		0x04	/* RO structural parameters 1 */
 #define  XHCI_HCS1_DEVSLOT_MAX(x)((x) & 0xff)
 #define  XHCI_HCS1_IRQ_MAX(x)	(((x) >> 8) & 0x3ff)
 #define  XHCI_HCS1_N_PORTS(x)	(((x) >> 24) & 0xff)
 
-#define XHCI_HCSPARAMS2		0x08	/* RO structual parameters 2 */
+#define XHCI_HCSPARAMS2		0x08	/* RO structural parameters 2 */
 #define  XHCI_HCS2_IST(x)	((x) & 0x7)
 #define  XHCI_HCS2_IST_MICRO(x) (!((x) & 0x8))
 #define  XHCI_HCS2_ERST_MAX(x)	(((x) >> 4) & 0xf)
@@ -78,7 +78,7 @@
 #define  XHCI_HCS2_SPR(x)	(((x) >> 26) & 0x1)
 #define  XHCI_HCS2_SPB_MAX(x)	((((x) >> 16) & 0x3e0) | (((x) >> 27) & 0x1f))
 
-#define XHCI_HCSPARAMS3		0x0c	/* RO structual parameters 3 */
+#define XHCI_HCSPARAMS3		0x0c	/* RO structural parameters 3 */
 #define  XHCI_HCS3_U1_DEL(x)	((x) & 0xff)
 #define  XHCI_HCS3_U2_DEL(x)	(((x) >> 16) & 0xffff)
 
diff --git a/sys/dev/x86emu/x86emu.c b/sys/dev/x86emu/x86emu.c
index e521b812159..d9d49b0a3ab 100644
--- a/sys/dev/x86emu/x86emu.c
+++ b/sys/dev/x86emu/x86emu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x86emu.c,v 1.12 2022/01/09 05:43:02 jsg Exp $	*/
+/*	$OpenBSD: x86emu.c,v 1.13 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: x86emu.c,v 1.7 2009/02/03 19:26:29 joerg Exp $	*/
 
 /*
@@ -398,7 +398,7 @@ fetch_long_imm(struct x86emu *emu)
  * 	gs segment override
  * 	ss segment override
  * 
- * 	ds/ss select (in absense of override)
+ * 	ds/ss select (in absence of override)
  * 
  * Each of the above 7 items are handled with a bit in the mode field.
  */
diff --git a/sys/lib/libkern/arch/arm/divsi3.S b/sys/lib/libkern/arch/arm/divsi3.S
index f655cc8a804..5ae5b1b4f1e 100644
--- a/sys/lib/libkern/arch/arm/divsi3.S
+++ b/sys/lib/libkern/arch/arm/divsi3.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: divsi3.S,v 1.6 2022/12/08 01:25:46 guenther Exp $	*/
+/*	$OpenBSD: divsi3.S,v 1.7 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: divsi3.S,v 1.2 2001/11/13 20:06:40 chris Exp $	*/
 
 /*
@@ -371,7 +371,7 @@ L_divide_b0:
 	cmp	ip, #0
 	rsbmi	r1, r1, #0
 	movs	ip, ip, lsl #1
-	bicmi	r0, r0, #0x80000000	/* Fix incase we divided 0x80000000 */
+	bicmi	r0, r0, #0x80000000	/* Fix in case we divided 0x80000000 */
 	rsbmi	r0, r0, #0
 	mov	pc, lr
 
diff --git a/sys/lib/libkern/arch/mips64/memmove.S b/sys/lib/libkern/arch/mips64/memmove.S
index 411a187f391..f4f7a5c8d88 100644
--- a/sys/lib/libkern/arch/mips64/memmove.S
+++ b/sys/lib/libkern/arch/mips64/memmove.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memmove.S,v 1.6 2022/01/29 05:47:36 visa Exp $	*/
+/*	$OpenBSD: memmove.S,v 1.7 2024/09/04 07:54:52 mglocker Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -70,7 +70,7 @@ ALEAF(bcopy)
 	PTR_ADDU t1, a1, a2		# t1 = end of to region
 1:
 	lb	v1, -1(t0)		# copy bytes backwards,
-	PTR_SUBU t0, t0, 1		#   doesnt happen often so do slow way
+	PTR_SUBU t0, t0, 1		#   doesn't happen often so do slow way
 	PTR_SUBU t1, t1, 1
 	bne	t0, a0, 1b
 	sb	v1, 0(t1)
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 5e912766d5e..5e4373c0730 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.141 2024/05/13 11:17:40 semarie Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.142 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -717,7 +717,7 @@ msdosfs_write(void *v)
 		 * it.  Otherwise, if on a cluster boundary write it
 		 * asynchronously so we can move on to the next block
 		 * without delay.  Otherwise do a delayed write because we
-		 * may want to write somemore into the block later.
+		 * may want to write some more into the block later.
 		 */
 #if 0
 		if (ioflag & IO_NOCACHE)
diff --git a/sys/net/if_aggr.c b/sys/net/if_aggr.c
index 3780d82df74..ca59131da7f 100644
--- a/sys/net/if_aggr.c
+++ b/sys/net/if_aggr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aggr.c,v 1.45 2024/03/18 06:14:50 dlg Exp $ */
+/*	$OpenBSD: if_aggr.c,v 1.46 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2019 The University of Queensland
@@ -1885,7 +1885,7 @@ aggr_set_selected(struct aggr_port *p, enum aggr_port_selected s,
 		    aggr_port_selected_names[s]);
 
 		/*
-		 * setting p_selected doesnt need the mtx except to
+		 * setting p_selected doesn't need the mtx except to
 		 * coordinate with a kstat read.
 		 */
 
diff --git a/sys/net/pf.c b/sys/net/pf.c
index a5eac9edbeb..29aee94f42f 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.1204 2024/08/06 16:56:09 bluhm Exp $ */
+/*	$OpenBSD: pf.c,v 1.1205 2024/09/04 07:54:52 mglocker Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -5008,7 +5008,7 @@ pf_tcp_track_full(struct pf_pdesc *pd, struct pf_state **stp, u_short *reason,
 	 * (Selective ACK). We could optionally validate the SACK values
 	 * against the current ACK window, either forwards or backwards, but
 	 * I'm not confident that SACK has been implemented properly
-	 * everywhere. It wouldn't surprise me if several stacks accidently
+	 * everywhere. It wouldn't surprise me if several stacks accidentally
 	 * SACK too far backwards of previously ACKed data. There really aren't
 	 * any security implications of bad SACKing unless the target stack
 	 * doesn't validate the option length correctly. Someone trying to
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index e3c5fc207b0..fe5d0c0c5b7 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.c,v 1.198 2023/10/22 12:01:36 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_node.c,v 1.199 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $	*/
 
 /*-
@@ -2444,7 +2444,7 @@ ieee80211_40mhz_valid_secondary_below(uint8_t primary_chan)
  * Only accept 40 MHz channel configurations that conform to
  * regulatory operating classes as defined by the 802.11ac spec.
  * Passing other configurations down to firmware can result in
- * regulatory assertions being trigged, such as fatal firmware
+ * regulatory assertions being triggered, such as fatal firmware
  * error 14FD in iwm(4).
  *
  * See 802.11ac 2013, page 380, Tables E-1 to E-5.
@@ -2521,7 +2521,7 @@ ieee80211_setup_vhtcaps(struct ieee80211_node *ni, const uint8_t *data,
  * Only accept 80 MHz channel configurations that conform to
  * regulatory operating classes as defined by the 802.11ac spec.
  * Passing other configurations down to firmware can result in
- * regulatory assertions being trigged, such as fatal firmware
+ * regulatory assertions being triggered, such as fatal firmware
  * error 14FD in iwm(4).
  *
  * See 802.11ac 2013, page 380, Tables E-1 to E-5.
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index fce85be1a2c..6b76134763d 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.282 2024/07/14 18:53:39 bluhm Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.283 2024/09/04 07:54:52 mglocker Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -99,7 +99,7 @@ struct mutex nd6_mtx = MUTEX_INITIALIZER(IPL_SOFTNET);
 TAILQ_HEAD(llinfo_nd6_head, llinfo_nd6) nd6_list =
     TAILQ_HEAD_INITIALIZER(nd6_list);	/* [mN] list of llinfo_nd6 structures */
 struct	pool nd6_pool;		/* [I] pool for llinfo_nd6 structures */
-int	nd6_inuse;		/* [m] limit neigbor discovery routes */
+int	nd6_inuse;		/* [m] limit neighbor discovery routes */
 unsigned int	ln_hold_total;	/* [a] packets currently in the nd6 queue */
 
 void nd6_timer(void *);
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index f75122ed20d..aa22757800e 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_socket.c,v 1.151 2024/07/12 17:20:18 mvs Exp $	*/
+/*	$OpenBSD: nfs_socket.c,v 1.152 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $	*/
 
 /*
@@ -996,10 +996,10 @@ tryagain:
 
 	/*
 	 * Since we only support RPCAUTH_UNIX atm we step over the
-	 * reply verifer type, and in the (error) case that there really
+	 * reply verifier type, and in the (error) case that there really
 	 * is any data in it, we advance over it.
 	 */
-	tl++;			/* Step over verifer type */
+	tl++;			/* Step over verifier type */
 	i = fxdr_unsigned(int32_t, *tl);
 	if (i > 0) {
 		/* Should not happen */
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 63f85c24253..df0a4c542eb 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_subs.c,v 1.149 2024/05/01 13:15:59 jsg Exp $	*/
+/*	$OpenBSD: nfs_subs.c,v 1.150 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $	*/
 
 /*
@@ -565,7 +565,7 @@ nfsm_rpchead(struct nfsreq *req, struct ucred *cr, int auth_type)
 
 	/*
 	 * We need to start out by finding how big the authorization cred
-	 * and verifer are for the auth_type, to be able to correctly
+	 * and verifier are for the auth_type, to be able to correctly
 	 * align the mbuf header/chain.
 	 */
 	switch (auth_type) {
@@ -573,7 +573,7 @@ nfsm_rpchead(struct nfsreq *req, struct ucred *cr, int auth_type)
 		/*
 		 * In the RPCAUTH_UNIX case, the size is the static
 		 * part as shown in RFC1831 + the number of groups,
-		 * RPCAUTH_UNIX has a zero verifer.
+		 * RPCAUTH_UNIX has a zero verifier.
 		 */
 		if (cr->cr_ngroups > req->r_nmp->nm_numgrps)
 			ngroups = req->r_nmp->nm_numgrps;
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index d665f5db8df..55a1a02065c 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_vfsops.c,v 1.65 2022/01/11 03:13:59 jsg Exp $	*/
+/*	$OpenBSD: ntfs_vfsops.c,v 1.66 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $	*/
 
 /*-
@@ -340,7 +340,7 @@ ntfs_mountfs(struct vnode *devvp, struct mount *mp, struct ntfs_args *argsp,
 
 	/*
 	 * We read in some system nodes to do not allow 
-	 * reclaim them and to have everytime access to them.
+	 * reclaim them and to have every time access to them.
 	 */ 
 	{
 		int pi[3] = { NTFS_MFTINO, NTFS_ROOTINO, NTFS_BITMAPINO };
diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c
index 32831c4f174..25639597226 100644
--- a/sys/scsi/safte.c
+++ b/sys/scsi/safte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safte.c,v 1.67 2021/10/24 16:57:30 mpi Exp $ */
+/*	$OpenBSD: safte.c,v 1.68 2024/09/04 07:54:53 mglocker Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
@@ -352,7 +352,7 @@ safte_read_config(struct safte_softc *sc)
 
 	/*
 	 * Stash the temp info so we can get out of range status. Limit the
-	 * number so the out of temp checks can't go into memory it doesnt own.
+	 * number so the out of temp checks can't go into memory it doesn't own.
 	 */
 	sc->sc_ntemps = (config->ntemps > 15) ? 15 : config->ntemps;
 	sc->sc_temps = s;
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 110b49628ab..0b4bced9bba 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.283 2023/08/02 19:58:52 kettenis Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.284 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -437,7 +437,7 @@ scsi_iopool_run(struct scsi_iopool *iopl)
 }
 
 /*
- * move an io from a runq to a proc thats waiting for an io.
+ * move an io from a runq to a proc that's waiting for an io.
  */
 
 void
@@ -1512,7 +1512,7 @@ scsi_xs_sync(struct scsi_xfer *xs)
 #endif /* DIAGNOSTIC */
 
 	/*
-	 * If we cant sleep while waiting for completion, get the adapter to
+	 * If we can't sleep while waiting for completion, get the adapter to
 	 * complete it for us.
 	 */
 	if (ISSET(xs->flags, SCSI_NOSLEEP))
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index ed0e1115b18..495020a23a3 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.253 2022/04/06 17:39:13 krw Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.254 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -524,7 +524,7 @@ scsi_probe_link(struct scsibus_softc *sb, int target, int lun, int dumbscan)
 	}
 
 	/*
-	 * If we havent been given an io pool by now then fall back to
+	 * If we haven't been given an io pool by now then fall back to
 	 * using link->openings.
 	 */
 	if (link->pool == NULL) {
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index fe1aa9fc7a7..9b02314c679 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.336 2024/05/04 16:40:38 kn Exp $	*/
+/*	$OpenBSD: sd.c,v 1.337 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -1648,7 +1648,7 @@ sd_get_parms(struct sd_softc *sc, int flags)
 		return -1;
 
 	if (ISSET(sc->flags, SDF_THIN) && sd_thin_params(sc, flags) != 0) {
-		/* we dont know the unmap limits, so we cant use thin shizz */
+		/* we don't know the unmap limits, so we can't use this shizz */
 		CLR(sc->flags, SDF_THIN);
 	}
 
diff --git a/sys/scsi/ses.h b/sys/scsi/ses.h
index 6b05e9c3aab..34a0adf4f63 100644
--- a/sys/scsi/ses.h
+++ b/sys/scsi/ses.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ses.h,v 1.10 2006/05/11 00:45:59 krw Exp $ */
+/* $OpenBSD: ses.h,v 1.11 2024/09/04 07:54:53 mglocker Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom
  * All rights reserved.
@@ -92,7 +92,7 @@ struct ses_enc_hdr {
 
 /* enclosure descriptor strings */
 struct ses_enc_desc {
-	u_int8_t	logical_id[8]; /* this isnt a string */
+	u_int8_t	logical_id[8]; /* this isn't a string */
 	u_int8_t	vendor_id[8];
 	u_int8_t	prod_id[16];
 	u_int8_t	prod_rev[4];
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 03312e21288..674954b7783 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.190 2023/04/27 18:21:44 robert Exp $	*/
+/*	$OpenBSD: st.c,v 1.191 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -1223,7 +1223,7 @@ stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
 
 try_new_value:
 	/*
-	 * Check that the mode being asked for is aggreeable to the
+	 * Check that the mode being asked for is agreeable to the
 	 * drive. If not, put it back the way it was.
 	 */
 	if ((error = st_mode_select(st, 0)) != 0) {/* put it back as it was */
diff --git a/sys/stand/efi/include/efiapi.h b/sys/stand/efi/include/efiapi.h
index 40a2ab06cc6..dcbe01d782c 100644
--- a/sys/stand/efi/include/efiapi.h
+++ b/sys/stand/efi/include/efiapi.h
@@ -211,7 +211,7 @@ VOID
 
 
 //
-// EFI platform varibles
+// EFI platform variables
 //
 
 #define EFI_GLOBAL_VARIABLE     \
@@ -672,7 +672,7 @@ typedef struct _EFI_TABLE_HEARDER {
 
 
 //
-// EFI Runtime Serivces Table
+// EFI Runtime Services Table
 //
 
 #define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552
diff --git a/sys/stand/efi/include/eficonsctl.h b/sys/stand/efi/include/eficonsctl.h
index 0ad3d759842..f61a8847e6e 100644
--- a/sys/stand/efi/include/eficonsctl.h
+++ b/sys/stand/efi/include/eficonsctl.h
@@ -65,7 +65,7 @@ EFI_STATUS
 
   Arguments:
     This         - Protocol instance pointer.
-    Mode         - Are we in text of grahics mode.
+    Mode         - Are we in text of graphics mode.
     GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device
     StdInLocked  - TRUE if StdIn device is keyboard locked
 
diff --git a/sys/stand/efi/include/efidef.h b/sys/stand/efi/include/efidef.h
index 772818b7bea..aae4fd7d1b9 100644
--- a/sys/stand/efi/include/efidef.h
+++ b/sys/stand/efi/include/efidef.h
@@ -135,7 +135,7 @@ typedef enum {
     MaxAllocateType
 } EFI_ALLOCATE_TYPE;
 
-//Preseve the attr on any range supplied.
+//Preserve the attr on any range supplied.
 //ConventialMemory must have WB,SR,SW when supplied.
 //When allocating from ConventialMemory always make it WB,SR,SW
 //When returning to ConventialMemory always make it WB,SR,SW
diff --git a/sys/stand/efi/include/efifs.h b/sys/stand/efi/include/efifs.h
index 765a41a490d..920232e7c61 100644
--- a/sys/stand/efi/include/efifs.h
+++ b/sys/stand/efi/include/efifs.h
@@ -29,7 +29,7 @@ Revision History
 
 
 //
-// EFI Partition header (normaly starts in LBA 1)
+// EFI Partition header (normally starts in LBA 1)
 //
 
 #define EFI_PARTITION_SIGNATURE         0x5053595320494249
@@ -85,7 +85,7 @@ typedef struct _EFI_FILE_HEADER {
 
 
 //
-// Logical Block Address List - the fundemental block
+// Logical Block Address List - the fundamental block
 // description structure
 //
 
diff --git a/sys/stand/efi/include/efiprot.h b/sys/stand/efi/include/efiprot.h
index 6ed8a28692d..6889e96b0a8 100644
--- a/sys/stand/efi/include/efiprot.h
+++ b/sys/stand/efi/include/efiprot.h
@@ -309,7 +309,7 @@ typedef struct {
 // Whenever code needs to know the size of the EFI_FILE_INFO data structure, it needs to
 // be the size of the data structure without the FileName field.  The following macro
 // computes this size correctly no matter how big the FileName array is declared.
-// This is required to make the EFI_FILE_INFO data structure ANSI compilant.
+// This is required to make the EFI_FILE_INFO data structure ANSI compliant.
 //
 
 #define SIZE_OF_EFI_FILE_INFO EFI_FIELD_OFFSET(EFI_FILE_INFO,FileName)
@@ -331,7 +331,7 @@ typedef struct {
 // Whenever code needs to know the size of the EFI_FILE_SYSTEM_INFO data structure, it needs
 // to be the size of the data structure without the VolumeLable field.  The following macro
 // computes this size correctly no matter how big the VolumeLable array is declared.
-// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compilant.
+// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compliant.
 //
 
 #define SIZE_OF_EFI_FILE_SYSTEM_INFO EFI_FIELD_OFFSET(EFI_FILE_SYSTEM_INFO,VolumeLabel)
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 1649289413d..392951b3a11 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.120 2024/06/07 09:26:37 jsg Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.121 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -1066,7 +1066,7 @@ ext2fs_cgupdate(struct ufsmount *mp, int waitfor)
 	return (allerror);
 }
 
-/* This is called before the superblock is copied.  Watch out for endianity! */
+/* This is called before the superblock is copied.  Watch out for endianness! */
 static int
 e2fs_sbcheck(struct ext2fs *fs, int ronly)
 {
diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c
index d022bdf3a3d..d2e8c8d7c11 100644
--- a/sys/uvm/uvm_addr.c
+++ b/sys/uvm/uvm_addr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_addr.c,v 1.36 2024/07/04 04:52:10 jsg Exp $	*/
+/*	$OpenBSD: uvm_addr.c,v 1.37 2024/09/04 07:54:53 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -1076,7 +1076,7 @@ uaddr_pivot_newpivot(struct vm_map *map, struct uaddr_pivot_state *uaddr,
  *
  * Characteristics of the allocator:
  * - best case, an allocation is O(log N)
- *   (it would be O(1), if it werent for the need to check if the memory is
+ *   (it would be O(1), if it weren't for the need to check if the memory is
  *   free; although that can be avoided...)
  * - worst case, an allocation is O(log N)
  *   (the uaddr_pivot_newpivot() function has that complexity)
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index fc0382fd224..b2df93b7edf 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_swap.c,v 1.170 2024/04/16 10:06:37 claudio Exp $	*/
+/*	$OpenBSD: uvm_swap.c,v 1.171 2024/09/04 07:54:53 mglocker Exp $	*/
 /*	$NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $	*/
 
 /*
@@ -1520,7 +1520,7 @@ ReTry:	/* XXXMRG */
  * smaller than the size of a cluster.
  *
  * As long as some swap slots are being used by pages currently in memory,
- * it is possible to reuse them.  Even if the swap space has been completly
+ * it is possible to reuse them.  Even if the swap space has been completely
  * filled we do not consider it full.
  */
 int