Module Name: src
Committed By: andvar
Date: Thu Aug 10 20:02:56 UTC 2023
Modified Files:
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/powerpc/booke: e500_timer.c
src/sys/arch/sparc64/include: ctlreg.h
src/sys/dev/pci: pci_subr.c
Log Message:
fix typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/booke/e500_timer.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc64/include/ctlreg.h
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.34 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.35
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.34 Thu Apr 20 08:28:04 2023
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Thu Aug 10 20:02:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.34 2023/04/20 08:28:04 skrll Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.35 2023/08/10 20:02:55 andvar Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.34 2023/04/20 08:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.35 2023/08/10 20:02:55 andvar Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1079,7 +1079,7 @@ printf("%s:%d: pmap_link_l2pt ipmq_pt\n"
#ifdef GEMINI_SLAVE
/*
- * Map all memory, incluuding that owned by other core
+ * Map all memory, including that owned by other core
* take into account the RAM remap, so view in this region
* is consistent with MASTER
*/
@@ -1094,7 +1094,7 @@ printf("%s:%d: pmap_link_l2pt ipmq_pt\n"
(MEMSIZE * 1024 * 1024),
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
#else
- /* Map all memory, incluuding that owned by other core */
+ /* Map all memory, including that owned by other core */
pmap_map_chunk(l1_va, GEMINI_ALLMEM_VBASE, GEMINI_ALLMEM_PBASE,
GEMINI_ALLMEM_SIZE * 1024 * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
#endif /* GEMINI_SLAVE */
Index: src/sys/arch/powerpc/booke/e500_timer.c
diff -u src/sys/arch/powerpc/booke/e500_timer.c:1.7 src/sys/arch/powerpc/booke/e500_timer.c:1.8
--- src/sys/arch/powerpc/booke/e500_timer.c:1.7 Fri May 29 12:30:40 2020
+++ src/sys/arch/powerpc/booke/e500_timer.c Thu Aug 10 20:02:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_timer.c,v 1.7 2020/05/29 12:30:40 rin Exp $ */
+/* $NetBSD: e500_timer.c,v 1.8 2023/08/10 20:02:56 andvar Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_timer.c,v 1.7 2020/05/29 12:30:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_timer.c,v 1.8 2023/08/10 20:02:56 andvar Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -92,7 +92,7 @@ e500_clock_intr(void *v)
* Now let's how delayed the clock interrupt was. Obviously it must
* at least one clock tick since the clock interrupt. But it might
* be more if interrupts were blocked for a long time. We keep
- * suubtracting an interrupts We should be
+ * subtracting an interrupts We should be
* [well] within a single tick.
* We add back one tick (which should put us back above 0). If we
* are still below 0, keep adding ticks until we are above 0.
Index: src/sys/arch/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.68 src/sys/arch/sparc64/include/ctlreg.h:1.69
--- src/sys/arch/sparc64/include/ctlreg.h:1.68 Sat May 6 22:17:28 2023
+++ src/sys/arch/sparc64/include/ctlreg.h Thu Aug 10 20:02:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.68 2023/05/06 22:17:28 andvar Exp $ */
+/* $NetBSD: ctlreg.h,v 1.69 2023/08/10 20:02:56 andvar Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -293,7 +293,7 @@
#define SFSR_FT_IO_ATOMIC 0x00200 /* DMMU: Atomic access to noncacheable page */
#define SFSR_FT_ILL_NF 0x00100 /* DMMU: NF load or flush to page marked E (has side effects) */
#define SFSR_FT_PRIV 0x00080 /* Privilege violation */
-#define SFSR_FT_E 0x00040 /* DMUU: value of E bit associated address */
+#define SFSR_FT_E 0x00040 /* DMMU: value of E bit associated address */
#define SFSR_CTXT(x) (((x)>>4)&0x3)
#define SFSR_CTXT_IS_PRIM(x) (SFSR_CTXT(x)==0x00)
#define SFSR_CTXT_IS_SECOND(x) (SFSR_CTXT(x)==0x01)
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.242 src/sys/dev/pci/pci_subr.c:1.243
--- src/sys/dev/pci/pci_subr.c:1.242 Tue Feb 1 01:28:26 2022
+++ src/sys/dev/pci/pci_subr.c Thu Aug 10 20:02:56 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.242 2022/02/01 01:28:26 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.243 2023/08/10 20:02:56 andvar Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.242 2022/02/01 01:28:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.243 2023/08/10 20:02:56 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -606,7 +606,7 @@ static const struct pci_class pci_subcla
/*
* Class 0x11.
- * Data aquuisition and signal processing controller.
+ * Data acquisition and signal processing controller.
*/
static const struct pci_class pci_subclass_dasp[] = {
{ "DPIO", PCI_SUBCLASS_DASP_DPIO, NULL, },
