Module Name: src
Committed By: andvar
Date: Wed Mar 16 20:31:02 UTC 2022
Modified Files:
src/sys/arch/amiga/amiga: locore.s
src/sys/arch/atari/atari: locore.s
src/sys/arch/luna68k/stand/boot: locore.S
src/sys/arch/next68k/dev: mb8795.c
src/sys/arch/powerpc/booke: e500_intr.c
src/sys/arch/sparc64/sparc64: ofw_machdep.c
src/sys/arch/sun2/sun2: locore.s
src/sys/arch/sun3/sun3: locore.s
src/sys/arch/sun3/sun3x: locore.s
src/sys/kern: subr_prf.c vfs_mount.c
Log Message:
s/paniced/panicked/ and s/borken/broken/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/luna68k/stand/boot/locore.S
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sparc64/sparc64/ofw_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sun2/sun2/locore.s
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sun3/sun3/locore.s
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sun3/sun3x/locore.s
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/vfs_mount.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/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.159 src/sys/arch/amiga/amiga/locore.s:1.160
--- src/sys/arch/amiga/amiga/locore.s:1.159 Tue Jul 21 06:39:31 2020
+++ src/sys/arch/amiga/amiga/locore.s Wed Mar 16 20:31:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.159 2020/07/21 06:39:31 rin Exp $ */
+/* $NetBSD: locore.s,v 1.160 2022/03/16 20:31:01 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -705,7 +705,7 @@ ENTRY_NOPROFILE(lev7intr)
*/
ASENTRY_NOPROFILE(rei)
#ifdef DEBUG
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
tstl _C_LABEL(astpending) | AST pending?
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.114 src/sys/arch/atari/atari/locore.s:1.115
--- src/sys/arch/atari/atari/locore.s:1.114 Fri May 3 01:08:28 2019
+++ src/sys/arch/atari/atari/locore.s Wed Mar 16 20:31:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.114 2019/05/03 01:08:28 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.115 2022/03/16 20:31:01 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -779,7 +779,7 @@ ENTRY_NOPROFILE(lev7intr)
*/
ASENTRY_NOPROFILE(rei)
#ifdef DEBUG
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
tstl _C_LABEL(astpending) | AST pending?
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.14 src/sys/arch/luna68k/stand/boot/locore.S:1.15
--- src/sys/arch/luna68k/stand/boot/locore.S:1.14 Fri Sep 28 04:34:02 2018
+++ src/sys/arch/luna68k/stand/boot/locore.S Wed Mar 16 20:31:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.14 2018/09/28 04:34:02 isaki Exp $ */
+/* $NetBSD: locore.S,v 1.15 2022/03/16 20:31:01 andvar Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -549,7 +549,7 @@ ENTRY_NOPROFILE(lev6intr)
.comm _ssir,1
ASENTRY_NOPROFILE(rei)
#ifdef DEBUG
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
btst #PCB_ASTB,_u+PCB_FLAGS+1| AST pending?
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.66 src/sys/arch/next68k/dev/mb8795.c:1.67
--- src/sys/arch/next68k/dev/mb8795.c:1.66 Wed Jan 29 05:31:10 2020
+++ src/sys/arch/next68k/dev/mb8795.c Wed Mar 16 20:31:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.66 2020/01/29 05:31:10 thorpej Exp $ */
+/* $NetBSD: mb8795.c,v 1.67 2022/03/16 20:31:01 andvar Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.66 2020/01/29 05:31:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.67 2022/03/16 20:31:01 andvar Exp $");
#include "opt_inet.h"
@@ -516,7 +516,7 @@ mb8795_init(struct mb8795_softc *sc)
if (turbo)
rxmode |= MB8795_RXMODE_TEST;
- /* switching mode probably borken now with turbo */
+ /* switching mode probably broken now with turbo */
MB_WRITE_REG(sc, MB8795_TXMODE,
turbo ? MB8795_TXMODE_TURBO1 : MB8795_TXMODE_LB_DISABLE);
MB_WRITE_REG(sc, MB8795_RXMODE, rxmode);
@@ -718,7 +718,7 @@ mb8795_start_dma(struct mb8795_softc *sc
txstat = MB_READ_REG(sc, MB8795_TXSTAT);
if (!turbo && !(txstat & MB8795_TXSTAT_READY)) {
/*
- * @@@ I used to panic here, but then it paniced once.
+ * @@@ I used to panic here, but then it panicked once.
* Let's see if I can just reset instead.
* [ dbj 980706.1900 ]
*/
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.45 src/sys/arch/powerpc/booke/e500_intr.c:1.46
--- src/sys/arch/powerpc/booke/e500_intr.c:1.45 Sat Sep 11 20:28:04 2021
+++ src/sys/arch/powerpc/booke/e500_intr.c Wed Mar 16 20:31:01 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.45 2021/09/11 20:28:04 andvar Exp $ */
+/* $NetBSD: e500_intr.c,v 1.46 2022/03/16 20:31:01 andvar Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.45 2021/09/11 20:28:04 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.46 2022/03/16 20:31:01 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_mpc85xx.h"
@@ -551,7 +551,7 @@ e500_splx(int ipl)
struct cpu_info * const ci = curcpu();
const int old_ipl = ci->ci_cpl;
- /* if we paniced because of watchdog, PSL_CE will be clear. */
+ /* if we panicked because of watchdog, PSL_CE will be clear. */
KASSERT(wdog_barked || (mfmsr() & PSL_CE));
if (ipl == old_ipl)
@@ -590,7 +590,7 @@ e500_splraise(int ipl)
struct cpu_info * const ci = curcpu();
const int old_ipl = ci->ci_cpl;
- /* if we paniced because of watchdog, PSL_CE will be clear. */
+ /* if we panicked because of watchdog, PSL_CE will be clear. */
KASSERT(wdog_barked || (mfmsr() & PSL_CE));
if (old_ipl < ipl) {
@@ -938,7 +938,7 @@ e500_extintr(struct trapframe *tf)
struct cpu_softc * const cpu = ci->ci_softc;
const int old_ipl = ci->ci_cpl;
- /* if we paniced because of watchdog, PSL_CE will be clear. */
+ /* if we panicked because of watchdog, PSL_CE will be clear. */
KASSERT(wdog_barked || (mfmsr() & PSL_CE));
#if 0
Index: src/sys/arch/sparc64/sparc64/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.48 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.49
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.48 Mon Jan 10 20:14:54 2022
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.48 2022/01/10 20:14:54 palle Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.49 2022/03/16 20:31:02 andvar Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.48 2022/01/10 20:14:54 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.49 2022/03/16 20:31:02 andvar Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -836,7 +836,7 @@ OF_mapintr(int node, int *interrupt, int
* bus format, and hunt up the parent bus to see if
* we need to remap.
*
- * The specification for interrupt mapping is borken.
+ * The specification for interrupt mapping is broken.
* You are supposed to query the interrupt parent in
* the interrupt-map specification to determine the
* number of address and interrupt cells, but we need
Index: src/sys/arch/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.28 src/sys/arch/sun2/sun2/locore.s:1.29
--- src/sys/arch/sun2/sun2/locore.s:1.28 Wed Mar 31 09:48:15 2021
+++ src/sys/arch/sun2/sun2/locore.s Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.28 2021/03/31 09:48:15 simonb Exp $ */
+/* $NetBSD: locore.s,v 1.29 2022/03/16 20:31:02 andvar Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -478,7 +478,7 @@ GLOBAL(eintrcnt)
ASGLOBAL(rei)
#ifdef DIAGNOSTIC
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
tstl _C_LABEL(astpending) | AST pending?
Index: src/sys/arch/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.100 src/sys/arch/sun3/sun3/locore.s:1.101
--- src/sys/arch/sun3/sun3/locore.s:1.100 Wed Mar 31 09:48:15 2021
+++ src/sys/arch/sun3/sun3/locore.s Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.100 2021/03/31 09:48:15 simonb Exp $ */
+/* $NetBSD: locore.s,v 1.101 2022/03/16 20:31:02 andvar Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -524,7 +524,7 @@ GLOBAL(eintrcnt)
ASGLOBAL(rei)
#ifdef DIAGNOSTIC
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
tstl _C_LABEL(astpending) | AST pending?
Index: src/sys/arch/sun3/sun3x/locore.s
diff -u src/sys/arch/sun3/sun3x/locore.s:1.68 src/sys/arch/sun3/sun3x/locore.s:1.69
--- src/sys/arch/sun3/sun3x/locore.s:1.68 Wed Mar 31 09:48:15 2021
+++ src/sys/arch/sun3/sun3x/locore.s Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.68 2021/03/31 09:48:15 simonb Exp $ */
+/* $NetBSD: locore.s,v 1.69 2022/03/16 20:31:02 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -509,7 +509,7 @@ GLOBAL(eintrcnt)
ASGLOBAL(rei)
#ifdef DIAGNOSTIC
- tstl _C_LABEL(panicstr) | have we paniced?
+ tstl _C_LABEL(panicstr) | have we panicked?
jne Ldorte | yes, do not make matters worse
#endif
tstl _C_LABEL(astpending) | AST pending?
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.186 src/sys/kern/subr_prf.c:1.187
--- src/sys/kern/subr_prf.c:1.186 Wed Mar 10 13:27:51 2021
+++ src/sys/kern/subr_prf.c Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.186 2021/03/10 13:27:51 simonb Exp $ */
+/* $NetBSD: subr_prf.c,v 1.187 2022/03/16 20:31:02 andvar Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.186 2021/03/10 13:27:51 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.187 2022/03/16 20:31:02 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -106,7 +106,7 @@ extern struct tty *constty; /* pointer t
extern int log_open; /* subr_log: is /dev/klog open? */
const char *panicstr; /* arg to first call to panic (used as a flag
to indicate that panic has already been called). */
-struct cpu_info *paniccpu; /* cpu that first paniced */
+struct cpu_info *paniccpu; /* cpu that first panicked */
long panicstart, panicend; /* position in the msgbuf of the start and
end of the formatted panicstr. */
int doing_shutdown; /* set to indicate shutdown in progress */
@@ -224,7 +224,7 @@ vpanic(const char *fmt, va_list ap)
/*
* Disable preemption. If already panicing on another CPU, sit
* here and spin until the system is rebooted. Allow the CPU that
- * first paniced to panic again.
+ * first panicked to panic again.
*/
kpreempt_disable();
ci = curcpu();
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.88 src/sys/kern/vfs_mount.c:1.89
--- src/sys/kern/vfs_mount.c:1.88 Sat Mar 12 15:32:32 2022
+++ src/sys/kern/vfs_mount.c Wed Mar 16 20:31:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.88 2022/03/12 15:32:32 riastradh Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.89 2022/03/16 20:31:02 andvar Exp $ */
/*-
* Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.88 2022/03/12 15:32:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.89 2022/03/16 20:31:02 andvar Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1110,7 +1110,7 @@ vfs_shutdown(void)
vfs_sync_all(l);
/*
- * If we have paniced - do not make the situation potentially
+ * If we have panicked - do not make the situation potentially
* worse by unmounting the file systems.
*/
if (panicstr != NULL) {
