Module Name: src
Committed By: andvar
Date: Mon Feb 24 21:32:27 UTC 2025
Modified Files:
src/sys/arch/alpha/include: fpu.h
src/sys/arch/hpcmips/vr: vrcpudef.h
src/sys/arch/rs6000/include: iplcb.h
src/sys/arch/sparc/conf: GENERIC KRUPS MRCOFFEE TADPOLE3GX
src/sys/arch/sparc64/conf: GENERIC
src/sys/uvm: uvm_mmap.c uvm_mremap.c
src/usr.sbin/sysinst/arch/evbarm: md.c
Log Message:
s/architecure/architecture/ and few other typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/include/fpu.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hpcmips/vr/vrcpudef.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/iplcb.h
cvs rdiff -u -r1.273 -r1.274 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sparc/conf/MRCOFFEE
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc/conf/TADPOLE3GX
cvs rdiff -u -r1.241 -r1.242 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.185 -r1.186 src/sys/uvm/uvm_mmap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/uvm/uvm_mremap.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/arch/evbarm/md.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/alpha/include/fpu.h
diff -u src/sys/arch/alpha/include/fpu.h:1.8 src/sys/arch/alpha/include/fpu.h:1.9
--- src/sys/arch/alpha/include/fpu.h:1.8 Thu Jul 22 01:39:18 2021
+++ src/sys/arch/alpha/include/fpu.h Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.8 2021/07/22 01:39:18 thorpej Exp $ */
+/* $NetBSD: fpu.h,v 1.9 2025/02/24 21:32:26 andvar Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -91,7 +91,7 @@
* appear to be identical.
*
* Bits 63-48 are reserved for implementation software.
- * Bits 47-23 are reserved for future archiecture definition.
+ * Bits 47-23 are reserved for future architecture definition.
* Bits 16-12 are reserved for implementation software.
* Bits 11-7 are reserved for future architecture definition.
* Bit 0 is reserved for implementation software.
Index: src/sys/arch/hpcmips/vr/vrcpudef.h
diff -u src/sys/arch/hpcmips/vr/vrcpudef.h:1.4 src/sys/arch/hpcmips/vr/vrcpudef.h:1.5
--- src/sys/arch/hpcmips/vr/vrcpudef.h:1.4 Sun Feb 10 15:09:32 2002
+++ src/sys/arch/hpcmips/vr/vrcpudef.h Mon Feb 24 21:32:26 2025
@@ -28,7 +28,7 @@
/*
* definition for identify VR series cpu
- * $NetBSD: vrcpudef.h,v 1.4 2002/02/10 15:09:32 sato Exp $
+ * $NetBSD: vrcpudef.h,v 1.5 2025/02/24 21:32:26 andvar Exp $
*
* REQUIRE #include "opt_vr41xx.h" before using this header.
*/
@@ -49,12 +49,12 @@
#define VRID_4181 0x10 /* VR4181 conflict VR4101 */
/*
- * VR cpu architecure group
+ * VR cpu architecture group
*
* vr41xx group: all vr cpus (some registers are same)
* vr4181 group: vr4181 (vrip address and registers are same)
* vr4101 group: vr4101???
- * vr4102 group: vr4102, vr4111, vr4121, vr4122 (some resgiters are same)
+ * vr4102 group: vr4102, vr4111, vr4121, vr4122 (some registers are same)
* or vr4102, vr4111, vr4121 (vrip address and registers are same)
* vr4111 group: vr4111, vr4121, vr4122 (some registers are same)
* or vr4111, vr4121 (vrip address and registers are same)
Index: src/sys/arch/rs6000/include/iplcb.h
diff -u src/sys/arch/rs6000/include/iplcb.h:1.2 src/sys/arch/rs6000/include/iplcb.h:1.3
--- src/sys/arch/rs6000/include/iplcb.h:1.2 Sat Jul 11 10:32:46 2015
+++ src/sys/arch/rs6000/include/iplcb.h Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: iplcb.h,v 1.2 2015/07/11 10:32:46 kamil Exp $ */
+/* $NetBSD: iplcb.h,v 1.3 2025/02/24 21:32:26 andvar Exp $ */
/* Structure for the IPL Control Block on RS/6000 machines */
@@ -139,7 +139,7 @@ struct sys_info {
u_char *loc_waddr; /* RA of APM space write */
int access_id_raddr;/* type of access to loc_raddr */
u_char *loc_raddr; /* RA of APM space read */
- int architecture; /* Architecutre of this box:
+ int architecture; /* Architecture of this box:
* RS6K = 1 = rs/6000 old mca
* RSPC = 2 = PReP */
int implementation;
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.273 src/sys/arch/sparc/conf/GENERIC:1.274
--- src/sys/arch/sparc/conf/GENERIC:1.273 Sun Feb 12 14:50:41 2023
+++ src/sys/arch/sparc/conf/GENERIC Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.273 2023/02/12 14:50:41 abs Exp $
+# $NetBSD: GENERIC,v 1.274 2025/02/24 21:32:26 andvar Exp $
#
# GENERIC machine description file
#
@@ -22,14 +22,14 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.273 $"
+#ident "GENERIC-$Revision: 1.274 $"
maxusers 32
## System kernel configuration. See options(4) for more detail.
-# Options for variants of the Sun SPARC architecure.
+# Options for variants of the Sun SPARC architecture.
# We currently support three architecture types; at least one is required.
options SUN4 # sun4/100, sun4/200, sun4/300
options SUN4C # sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc.
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.82 src/sys/arch/sparc/conf/KRUPS:1.83
--- src/sys/arch/sparc/conf/KRUPS:1.82 Sun Sep 15 19:19:58 2024
+++ src/sys/arch/sparc/conf/KRUPS Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.82 2024/09/15 19:19:58 uwe Exp $
+# $NetBSD: KRUPS,v 1.83 2025/02/24 21:32:26 andvar Exp $
# From NetBSD: GENERIC,v 1.273 2023/02/12 14:50:41 abs Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,14 +8,14 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.82 $"
+#ident "KRUPS-$Revision: 1.83 $"
maxusers 32
## System kernel configuration. See options(4) for more detail.
-# Options for variants of the Sun SPARC architecure.
+# Options for variants of the Sun SPARC architecture.
# We currently support three architecture types; at least one is required.
options SUN4M # sun4m - SS10, SS20, Classic, etc.
Index: src/sys/arch/sparc/conf/MRCOFFEE
diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.59 src/sys/arch/sparc/conf/MRCOFFEE:1.60
--- src/sys/arch/sparc/conf/MRCOFFEE:1.59 Sun Aug 7 02:52:29 2022
+++ src/sys/arch/sparc/conf/MRCOFFEE Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.59 2022/08/07 02:52:29 simonb Exp $
+# $NetBSD: MRCOFFEE,v 1.60 2025/02/24 21:32:26 andvar Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Mr.Coffee (JavaStation 1) machine description file
@@ -12,14 +12,14 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MRCOFFEE-$Revision: 1.59 $"
+#ident "MRCOFFEE-$Revision: 1.60 $"
maxusers 32
## System kernel configuration. See options(4) for more detail.
-# Options for variants of the Sun SPARC architecure.
+# Options for variants of the Sun SPARC architecture.
# We currently support three architecture types; at least one is required.
options SUN4M # sun4m - SS10, SS20, Classic, etc.
Index: src/sys/arch/sparc/conf/TADPOLE3GX
diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.78 src/sys/arch/sparc/conf/TADPOLE3GX:1.79
--- src/sys/arch/sparc/conf/TADPOLE3GX:1.78 Wed May 8 13:40:16 2019
+++ src/sys/arch/sparc/conf/TADPOLE3GX Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: TADPOLE3GX,v 1.78 2019/05/08 13:40:16 isaki Exp $
+# $NetBSD: TADPOLE3GX,v 1.79 2025/02/24 21:32:26 andvar Exp $
include "arch/sparc/conf/std.sparc"
@@ -12,7 +12,7 @@ maxusers 32
## System kernel configuration. See options(4) for more detail.
-# Options for variants of the Sun SPARC architecure.
+# Options for variants of the Sun SPARC architecture.
# We currently support three architecture types; at least one is required.
options SUN4M # sun4m - SS10, SS20, Classic, etc.
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.241 src/sys/arch/sparc64/conf/GENERIC:1.242
--- src/sys/arch/sparc64/conf/GENERIC:1.241 Tue Jul 16 12:01:19 2024
+++ src/sys/arch/sparc64/conf/GENERIC Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.241 2024/07/16 12:01:19 riastradh Exp $
+# $NetBSD: GENERIC,v 1.242 2025/02/24 21:32:26 andvar Exp $
#
# GENERIC machine description file
#
@@ -22,14 +22,14 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.241 $"
+#ident "GENERIC-$Revision: 1.242 $"
maxusers 64
## System kernel configuration. See options(4) for more detail.
-# Options for variants of the Sun SPARC architecure.
+# Options for variants of the Sun SPARC architecture.
options SUN4U # sun4u - UltraSPARC
options SUN4V # sun4v - UltraSPARC T1/T2+/T3/T4/T5
#options BLINK # blink the system LED
Index: src/sys/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.185 src/sys/uvm/uvm_mmap.c:1.186
--- src/sys/uvm/uvm_mmap.c:1.185 Tue Nov 21 14:35:36 2023
+++ src/sys/uvm/uvm_mmap.c Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mmap.c,v 1.185 2023/11/21 14:35:36 riastradh Exp $ */
+/* $NetBSD: uvm_mmap.c,v 1.186 2025/02/24 21:32:26 andvar Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.185 2023/11/21 14:35:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mmap.c,v 1.186 2025/02/24 21:32:26 andvar Exp $");
#include "opt_compat_netbsd.h"
#include "opt_pax.h"
@@ -887,7 +887,7 @@ uvm_mmap(struct vm_map *map, vaddr_t *ad
/*
* Try to see if any requested alignment can even be attemped.
* Make sure we can express the alignment (asking for a >= 4GB
- * alignment on an ILP32 architecure make no sense) and the
+ * alignment on an ILP32 architecture make no sense) and the
* alignment is at least for a page sized quanitiy. If the
* request was for a fixed mapping, make sure supplied address
* adheres to the request alignment.
Index: src/sys/uvm/uvm_mremap.c
diff -u src/sys/uvm/uvm_mremap.c:1.21 src/sys/uvm/uvm_mremap.c:1.22
--- src/sys/uvm/uvm_mremap.c:1.21 Fri Nov 27 22:32:43 2020
+++ src/sys/uvm/uvm_mremap.c Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $ */
+/* $NetBSD: uvm_mremap.c,v 1.22 2025/02/24 21:32:26 andvar Exp $ */
/*-
* Copyright (c)2006,2007,2009 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.21 2020/11/27 22:32:43 yhardy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_mremap.c,v 1.22 2025/02/24 21:32:26 andvar Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -139,7 +139,7 @@ uvm_mremap(struct vm_map *oldmap, vaddr_
/*
* Try to see if any requested alignment can even be attempted.
* Make sure we can express the alignment (asking for a >= 4GB
- * alignment on an ILP32 architecure make no sense) and the
+ * alignment on an ILP32 architecture make no sense) and the
* alignment is at least for a page sized quanitiy. If the
* request was for a fixed mapping, make sure supplied address
* adheres to the request alignment.
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.22 src/usr.sbin/sysinst/arch/evbarm/md.c:1.23
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.22 Sat Jan 29 16:01:17 2022
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Mon Feb 24 21:32:26 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.22 2022/01/29 16:01:17 martin Exp $ */
+/* $NetBSD: md.c,v 1.23 2025/02/24 21:32:26 andvar Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,7 @@ md_pre_disklabel(struct install_partitio
/*
* RAW_PART is 2 on evbarm and bad things happen if we
* write the MBR first and then the disklabel - so postpone
- * the MBR to md_post_disklabel(), unlike other architecturs.
+ * the MBR to md_post_disklabel(), unlike other architectures.
*/
return true;
}
@@ -354,7 +354,7 @@ md_mbr_update_check(struct disk_partitio
#ifdef HAVE_GPT
/*
* New GPT partitions have been written, update bootloader or remember
- * data untill needed in md_post_newfs
+ * data until needed in md_post_newfs
*/
bool
md_gpt_post_write(struct disk_partitions *parts, part_id root_id,
