 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -695,27 +695,27 @@ ENTRY_NOPROFILE(lev7intr)
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.  After identifing that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.  A cleanup should only be needed at this
  * point for coprocessor mid-instruction frames (type 9), but we also test
  * for bus error frames (type 10 and 11).
  */
 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?
 	jeq	Ldorte			| no, done
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Ldorte			| no, done
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 	clrl	%sp@-			| stack adjust
 	moveml	%d0-%d7/%a0-%a7,%sp@-	| save all registers
 	movl	%usp,%a1		| including
 	movl	%a1,%sp@(FR_SP)		|    the users SP
 	clrl	%sp@-			| VA == none

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1980, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -769,27 +769,27 @@ ENTRY_NOPROFILE(lev7intr)
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.  After identifing that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.  A cleanup should only be needed at this
  * point for coprocessor mid-instruction frames (type 9), but we also test
  * for bus error frames (type 10 and 11).
  */
 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?
 	jeq	Lchksir			|  no, go check for SIR
 Lrei1:
 	btst	#5,%sp@			|  yes, are we returning to user mode?
 	jne	Lchksir			|  no, go check for SIR
 	movw	#PSL_LOWIPL,%sr		|  lower SPL
 	clrl	%sp@-			|  stack adjust
 	moveml	#0xFFFF,%sp@-		|  save all registers
 	movl	%usp,%a1		|  including
 	movl	%a1,%sp@(FR_SP)		|     the users SP
 	clrl	%sp@-			|  VA == none

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -539,27 +539,27 @@ ENTRY_NOPROFILE(lev6intr)
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.  A cleanup should only be needed at this
  * point for coprocessor mid-instruction frames (type 9), but we also test
  * for bus error frames (type 10 and 11).
  */
 #if 0
 	.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?
 	jeq	Lchksir			| no, go check for SIR
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Lchksir			| no, go check for SIR
 	clrw	%sp@-			| pad SR to longword
 	moveml	#0xFFFF,%sp@-		| save all registers
 	movl	%usp,%a1		| including
 	movl	%a1,%sp@(60)		|    the users SP
 	clrl	%sp@-			| VA == none
 	clrl	%sp@-			| code == none
 	movl	#T_ASTFLT,%sp@-		| type == async system trap

 @@ -1,41 +1,41 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/rndsource.h>
 @@ -506,27 +506,27 @@ mb8795_init(struct mb8795_softc *sc)
 		s = spldma();
 		if ((ifp->if_flags & IFF_RUNNING) == 0)
 			mb8795_reset(sc);
 		if (ifp->if_flags & IFF_PROMISC)
 			rxmode = MB8795_RXMODE_PROMISCUOUS;
 		else
 			rxmode = MB8795_RXMODE_NORMAL;
 		/* XXX add support for multicast */
 		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);
 		if ((ifp->if_flags & IFF_RUNNING) == 0) {
 			MBDMA_RX_SETUP(sc);
 			MBDMA_TX_SETUP(sc);
 			ifp->if_flags |= IFF_RUNNING;
 			ifp->if_flags &= ~IFF_OACTIVE;
 			ifp->if_timer = 0;
 			MBDMA_RX_GO(sc);
 @@ -708,27 +708,27 @@ mb8795_start_dma(struct mb8795_softc *sc
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mbuf *m;
 	u_char txmask;
 	DPRINTF(("%s: mb8795_start_dma()\n", device_xname(sc->sc_dev)));
 #if (defined(DIAGNOSTIC))
+	{
 		u_char txstat;
 		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 ]
 			 */
 			printf("%s: transmitter not ready\n",
 				device_xname(sc->sc_dev));
 			ifp->if_flags &= ~IFF_RUNNING;
 			mb8795_init(sc);
 			return;
+		}
+	}
 #endif
 #if 0

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -27,27 +27,27 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_multiprocessor.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/intr.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 @@ -541,27 +541,27 @@ e500_spl0(void)
+	}
 #endif /* __HAVE_FAST_SOFTINTS */
 	e500_splset(ci, IPL_NONE);
 	wrtee(PSL_EE);
+}
 static void
 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)
 		return;
 	if (__predict_false(ipl > old_ipl)) {
 		printf("%s: %p: cpl=%u: ignoring splx(%u) to raise ipl\n",
 		    __func__, __builtin_return_address(0), old_ipl, ipl);
 		if (old_ipl == IPL_NONE)
 			Debugger();
+	}
 	// const
 @@ -580,27 +580,27 @@ e500_splx(int ipl)
 #if 1
 	if (ipl < IPL_VM && old_ipl >= IPL_VM)
 		msr = PSL_EE;
 #endif
 	wrtee(msr);
+}
 static int
 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) {
 		//const
 		register_t msr = wrtee(0);
 		e500_splset(ci, ipl);
 #if 0
 		if (old_ipl < IPL_VM && ipl >= IPL_VM)
 			msr = 0;
 #endif
 		wrtee(msr);
+	}
 #if 0
 @@ -928,27 +928,27 @@ e500_wdogintr(struct trapframe *tf)
 	panic("%s: tf=%p tb=%"PRId64" srr0/srr1=%#lx/%#lx"
 	    " cpl=%d idepth=%d, mtxcount=%d",
 	    __func__, tf, mftb(), tf->tf_srr0, tf->tf_srr1,
 	    ci->ci_cpl, ci->ci_idepth, ci->ci_mtx_count);
+}
 static void
 e500_extintr(struct trapframe *tf)
+{
 	struct cpu_info * const ci = curcpu();
 	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
 //	printf("%s(%p): idepth=%d enter\n", __func__, tf, ci->ci_idepth);
 	if ((register_t)tf >= (register_t)curlwp->l_addr + USPACE
 	    || (register_t)tf < (register_t)curlwp->l_addr + NBPG) {
 		printf("%s(entry): pid %d.%d (%s): srr0/srr1=%#lx/%#lx: invalid tf addr %p\n",
 		    __func__, curlwp->l_proc->p_pid, curlwp->l_lid,
 		    curlwp->l_proc->p_comm, tf->tf_srr0, tf->tf_srr1, tf);
+	}
 #endif

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (C) 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -24,27 +24,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/kprintf.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 @@ -826,27 +826,27 @@ OF_mapintr(int node, int *interrupt, int
 		    && !strcmp(model, "SUNW,psycho")) {
 			DPRINTF(("OF_mapintr: interrupt %x already mapped\n",
 			    *interrupt));
 			return validlen;
+		}
+	}
 	/*
 	 * If there is no interrupt map in the bus node, we
 	 * need to convert the slot address to its parent
 	 * 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
 	 * to know how many address and interrupt cells to skip
 	 * to find the phandle...
+	 *
 	 */
 	if ((len = OF_getprop(node, "reg", &reg, sizeof(reg))) <= 0) {
 		printf("OF_mapintr: no reg property?\n");
 		return (-1);
+	}
 	while (node) {

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -468,27 +468,27 @@ GLOBAL(eintrcnt)
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 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?
 	jeq	Ldorte			| no, done
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Ldorte			| no, done
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 	clrl	%sp@-			| stack adjust
 	moveml	#0xFFFF,%sp@-		| save all registers
 	movl	%usp,%a1		| including
 	movl	%a1,%sp@(FR_SP)		|    the users SP
 	clrl	%sp@-			| VA == none

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -514,27 +514,27 @@ GLOBAL(eintrcnt)
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 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?
 	jeq	Ldorte			| no, done
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Ldorte			| no, done
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 	clrl	%sp@-			| stack adjust
 	moveml	#0xFFFF,%sp@-		| save all registers
 	movl	%usp,%a1		| including
 	movl	%a1,%sp@(FR_SP)		|    the users SP
 	clrl	%sp@-			| VA == none

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1980, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -499,27 +499,27 @@ GLOBAL(eintrcnt)
  * This code deals with checking for and servicing ASTs
  * (profiling, scheduling) and software interrupts (network, softclock).
  * We check for ASTs first, just like the VAX.  To avoid excess overhead
  * the T_ASTFLT handling code will also check for software interrupts so we
  * do not have to do it here.  After identifying that we need an AST we
  * drop the IPL to allow device interrupts.
+ *
  * This code is complicated by the fact that sendsig may have been called
  * necessitating a stack cleanup.
  */
 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?
 	jeq	Ldorte			| no, done
 Lrei1:
 	btst	#5,%sp@			| yes, are we returning to user mode?
 	jne	Ldorte			| no, done
 	movw	#PSL_LOWIPL,%sr		| lower SPL
 	clrl	%sp@-			| stack adjust
 	moveml	#0xFFFF,%sp@-		| save all registers
 	movl	%usp,%a1		| including
 	movl	%a1,%sp@(FR_SP)		|    the users SP
 	clrl	%sp@-			| VA == none

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)subr_prf.c	8.4 (Berkeley) 5/4/95
  */
 #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"
 #include "opt_kgdb.h"
 #include "opt_dump.h"
 #include "opt_rnd_printf.h"
 #endif
 #include <sys/param.h>
 #include <sys/stdint.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 @@ -96,27 +96,27 @@ static bool kprintf_inited = false;
  */
 static void	 putchar(int, int, struct tty *);
 /*
  * globals
  */
 extern	struct tty *constty;	/* pointer to console "window" tty */
 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 */
 #ifdef RND_PRINTF
 static krndsource_t	rnd_printf_source;
 #endif
 #ifndef	DUMP_ON_PANIC
 #define	DUMP_ON_PANIC	1
 #endif
 int	dumponpanic = DUMP_ON_PANIC;
 @@ -214,27 +214,27 @@ void
 vpanic(const char *fmt, va_list ap)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci, *oci;
 	int bootopt;
 	static char scratchstr[384]; /* stores panic message */
 	spldebug_stop();
 	if (lwp0.l_cpu && curlwp) {
 		/*
 		 * 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();
 		oci = atomic_cas_ptr((void *)&paniccpu, NULL, ci);
 		if (oci != NULL && oci != ci) {
 			/* Give interrupts a chance to try and prevent deadlock. */
 			for (;;) {
 #ifndef _RUMPKERNEL /* XXXpooka: temporary build fix, see kern/40505 */
 				DELAY(10);
 #endif /* _RUMPKERNEL */
+			}
+		}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
  */
 #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>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 @@ -1100,27 +1100,27 @@ vfs_sync_all(struct lwp *l)
+}
 /*
  * Sync and unmount file systems before shutting down.
  */
 void
 vfs_shutdown(void)
+{
 	lwp_t *l = curlwp;
 	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) {
 		return;
+	}
 	/* Unmount file systems. */
 	vfs_unmountall(l);
+}
 /*
  * Print a list of supported file system types (used by vfs_mountroot)
  */