summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/trap.c4
-rw-r--r--sys/arch/amd64/amd64/vmm_machdep.c5
-rw-r--r--sys/arch/hppa/include/mplock.h4
-rw-r--r--sys/arch/hppa/spmath/md.h4
-rw-r--r--sys/arch/i386/i386/trap.c4
-rw-r--r--sys/arch/luna88k/luna88k/disksubr.c6
-rw-r--r--sys/arch/macppc/dev/zs.c6
-rw-r--r--sys/arch/powerpc/include/mplock.h4
-rw-r--r--sys/arch/riscv64/dev/plic.c4
-rw-r--r--sys/arch/riscv64/riscv64/pmap.c4
-rw-r--r--sys/arch/sh/sh/interrupt.c4
-rw-r--r--sys/arch/sh/sh/vectors.S4
-rw-r--r--sys/arch/sparc64/dev/fb.c4
-rw-r--r--sys/arch/sparc64/dev/zs.c4
-rw-r--r--sys/arch/sparc64/sparc64/locore.s6
-rw-r--r--sys/arch/sparc64/stand/bootblk/bootblk.fth6
16 files changed, 37 insertions, 36 deletions
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.
\