Module Name: src
Committed By: andvar
Date: Mon Aug 9 21:08:06 UTC 2021
Modified Files:
src/sys/arch/sparc/sparc: iommu.c locore.s pmap.c
src/sys/arch/sparc64/sparc64: machdep.c
src/sys/dev/pci: if_dge.c
src/sys/lib/libunwind: DwarfParser.hpp
Log Message:
s/aligment/alignment/ + one more typo fix in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/sparc/sparc/locore.s
cvs rdiff -u -r1.374 -r1.375 src/sys/arch/sparc/sparc/pmap.c
cvs rdiff -u -r1.299 -r1.300 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_dge.c
cvs rdiff -u -r1.6 -r1.7 src/sys/lib/libunwind/DwarfParser.hpp
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/sparc/sparc/iommu.c
diff -u src/sys/arch/sparc/sparc/iommu.c:1.99 src/sys/arch/sparc/sparc/iommu.c:1.100
--- src/sys/arch/sparc/sparc/iommu.c:1.99 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc/sparc/iommu.c Mon Aug 9 21:08:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.99 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: iommu.c,v 1.100 2021/08/09 21:08:06 andvar Exp $ */
/*
* Copyright (c) 1996
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.99 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.100 2021/08/09 21:08:06 andvar Exp $");
#include "opt_sparc_arch.h"
@@ -763,7 +763,7 @@ iommu_dmamem_map(bus_dma_tag_t t, bus_dm
/*
* In case the segment has already been loaded by
* iommu_dmamap_load_raw(), find a region of kernel virtual
- * addresses that can accommodate our aligment requirements.
+ * addresses that can accommodate our alignment requirements.
*/
va = _bus_dma_valloc_skewed(size, 0, align,
segs[0].ds_addr & (align - 1));
Index: src/sys/arch/sparc/sparc/locore.s
diff -u src/sys/arch/sparc/sparc/locore.s:1.280 src/sys/arch/sparc/sparc/locore.s:1.281
--- src/sys/arch/sparc/sparc/locore.s:1.280 Sun Apr 25 21:59:38 2021
+++ src/sys/arch/sparc/sparc/locore.s Mon Aug 9 21:08:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.280 2021/04/25 21:59:38 mrg Exp $ */
+/* $NetBSD: locore.s,v 1.281 2021/08/09 21:08:06 andvar Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -356,7 +356,7 @@ sun4_notsup:
_C_LABEL(kernel_text) = start ! for kvm_mkdb(8)
_ASM_LABEL(start):
/*
- * Put sun4 traptable first, since it needs the most stringent aligment (8192)
+ * Put sun4 traptable first, since it needs the most stringent alignment (8192)
*/
#if defined(SUN4)
trapbase_sun4:
Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.374 src/sys/arch/sparc/sparc/pmap.c:1.375
--- src/sys/arch/sparc/sparc/pmap.c:1.374 Sat Aug 7 19:23:03 2021
+++ src/sys/arch/sparc/sparc/pmap.c Mon Aug 9 21:08:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.374 2021/08/07 19:23:03 uwe Exp $ */
+/* $NetBSD: pmap.c,v 1.375 2021/08/09 21:08:06 andvar Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.374 2021/08/07 19:23:03 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.375 2021/08/09 21:08:06 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -310,7 +310,7 @@ struct mmuentry region_freelist, region_
#endif
/*
* We use a double linked list looping through its static head (which
- * alway remains on the list), so we can remove any other member from
+ * always remains on the list), so we can remove any other member from
* a list without knowing which list it is on.
*/
static void inline
@@ -3636,7 +3636,7 @@ pmap_bootstrap4m(void *top)
/*
* Allocate context table.
- * To keep supersparc happy, minimum aligment is on a 4K boundary.
+ * To keep supersparc happy, minimum alignment is on a 4K boundary.
*/
ctxtblsize = uimax(ncontext,1024) * sizeof(int);
cpuinfo.ctx_tbl = (int *)roundup((u_int)p, ctxtblsize);
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.299 src/sys/arch/sparc64/sparc64/machdep.c:1.300
--- src/sys/arch/sparc64/sparc64/machdep.c:1.299 Mon Jan 4 14:48:52 2021
+++ src/sys/arch/sparc64/sparc64/machdep.c Mon Aug 9 21:08:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.299 2021/01/04 14:48:52 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.300 2021/08/09 21:08:06 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2019 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.299 2021/01/04 14:48:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.300 2021/08/09 21:08:06 andvar Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -1461,7 +1461,7 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma
/*
* Find a region of kernel virtual addresses that can accommodate
- * our aligment requirements.
+ * our alignment requirements.
*/
oversize = size + align - PAGE_SIZE;
r = uvm_map(kernel_map, &sva, oversize, NULL, UVM_UNKNOWN_OFFSET, 0,
Index: src/sys/dev/pci/if_dge.c
diff -u src/sys/dev/pci/if_dge.c:1.59 src/sys/dev/pci/if_dge.c:1.60
--- src/sys/dev/pci/if_dge.c:1.59 Sat May 8 00:27:02 2021
+++ src/sys/dev/pci/if_dge.c Mon Aug 9 21:08:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.59 2021/05/08 00:27:02 thorpej Exp $ */
+/* $NetBSD: if_dge.c,v 1.60 2021/08/09 21:08:06 andvar Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.59 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.60 2021/08/09 21:08:06 andvar Exp $");
@@ -1885,7 +1885,7 @@ dge_init(struct ifnet *ifp)
uint32_t reg;
/*
- * *_HDR_ALIGNED_P is constant 1 if __NO_STRICT_ALIGMENT is set.
+ * *_HDR_ALIGNED_P is constant 1 if __NO_STRICT_ALIGNMENT is set.
* There is a small but measurable benefit to avoiding the adjusment
* of the descriptor so that the headers are aligned, for normal mtu,
* on such platforms. One possibility is that the DMA itself is
Index: src/sys/lib/libunwind/DwarfParser.hpp
diff -u src/sys/lib/libunwind/DwarfParser.hpp:1.6 src/sys/lib/libunwind/DwarfParser.hpp:1.7
--- src/sys/lib/libunwind/DwarfParser.hpp:1.6 Tue Feb 23 15:07:32 2021
+++ src/sys/lib/libunwind/DwarfParser.hpp Mon Aug 9 21:08:06 2021
@@ -234,7 +234,7 @@ bool CFI_Parser<A, R>::parseCIE(A &addre
while (addressSpace.get8(p) != 0)
++p;
++p;
- // Parse code aligment factor
+ // Parse code alignment factor
cieInfo->codeAlignFactor = addressSpace.getULEB128(p, cieContentEnd);
// Parse data alignment factor
cieInfo->dataAlignFactor = addressSpace.getSLEB128(p, cieContentEnd);
