Module Name: src
Committed By: andvar
Date: Sat May 11 06:50:23 UTC 2024
Modified Files:
src/share/man/man4: options.4
src/sys/arch/xen/x86: x86_xpmap.c
src/usr.sbin/installboot/arch: landisk.c
Log Message:
s/boostrap/bootstrap/ in comment, warning message and documentation.
To generate a diff of this commit:
cvs rdiff -u -r1.528 -r1.529 src/share/man/man4/options.4
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/installboot/arch/landisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.528 src/share/man/man4/options.4:1.529
--- src/share/man/man4/options.4:1.528 Mon Jan 29 18:27:09 2024
+++ src/share/man/man4/options.4 Sat May 11 06:50:23 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.528 2024/01/29 18:27:09 christos Exp $
+.\" $NetBSD: options.4,v 1.529 2024/05/11 06:50:23 andvar Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -1296,7 +1296,7 @@ Make the kernel able to self relocate at
run whatever its load address is.
This is intented to be used withe the
.Ic reloc
-boostrap command documented in
+bootstrap command documented in
.Xr x86/boot 8 ,
to workaround UEFI bugs, and is only available on amd64.
.It Cd options SPLDEBUG
Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.92 src/sys/arch/xen/x86/x86_xpmap.c:1.93
--- src/sys/arch/xen/x86/x86_xpmap.c:1.92 Sat Aug 20 23:48:51 2022
+++ src/sys/arch/xen/x86/x86_xpmap.c Sat May 11 06:50:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_xpmap.c,v 1.92 2022/08/20 23:48:51 riastradh Exp $ */
+/* $NetBSD: x86_xpmap.c,v 1.93 2024/05/11 06:50:23 andvar Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.92 2022/08/20 23:48:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.93 2024/05/11 06:50:23 andvar Exp $");
#include "opt_xen.h"
#include "opt_ddb.h"
@@ -503,7 +503,7 @@ xen_locore(void)
x86_cpuid(0x80000001, descs);
xpmap_pg_nx = (descs[3] & CPUID_NOX) ? PTE_NX : 0;
- /* Space after Xen boostrap tables should be free */
+ /* Space after Xen bootstrap tables should be free */
xen_tables = xen_start_info.pt_base;
our_tables = xen_tables + (xen_start_info.nr_pt_frames * PAGE_SIZE);
Index: src/usr.sbin/installboot/arch/landisk.c
diff -u src/usr.sbin/installboot/arch/landisk.c:1.8 src/usr.sbin/installboot/arch/landisk.c:1.9
--- src/usr.sbin/installboot/arch/landisk.c:1.8 Tue May 7 04:35:31 2019
+++ src/usr.sbin/installboot/arch/landisk.c Sat May 11 06:50:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: landisk.c,v 1.8 2019/05/07 04:35:31 thorpej Exp $ */
+/* $NetBSD: landisk.c,v 1.9 2024/05/11 06:50:23 andvar Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: landisk.c,v 1.8 2019/05/07 04:35:31 thorpej Exp $");
+__RCSID("$NetBSD: landisk.c,v 1.9 2024/05/11 06:50:23 andvar Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -146,7 +146,7 @@ landisk_setboot(ib_params *params)
magic = *(uint32_t *)(bootstrapbuf + 512 * 2 + 4);
if (magic != htole32(LANDISK_BOOT_MAGIC_1)) {
- warnx("Invalid magic in stage1 boostrap %x != %x",
+ warnx("Invalid magic in stage1 bootstrap %x != %x",
magic, htole32(LANDISK_BOOT_MAGIC_1));
goto done;
}
