 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu_machdep.c,v 1.1 2014/08/10 05:47:37 matt Exp $ */
+/* $NetBSD: cpu_machdep.c,v 1.2 2015/04/14 22:36:54 jmcneill Exp $ */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.1 2014/08/10 05:47:37 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.2 2015/04/14 22:36:54 jmcneill Exp $");
 #include "opt_pic.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/xcall.h>
 #include <aarch64/locore.h>
 #include <aarch64/pcb.h>
 @@ -102,27 +102,27 @@ softint_init_md(lwp_t *l, u_int level, u
 void
 dosoftints(void)
+{
 	struct cpu_info * const ci = curcpu();
 	const int opl = ci->ci_cpl;
 	const uint32_t softiplmask = SOFTIPLMASK(opl);
 	splhigh();
 	for (;;) {
 		u_int softints = ci->ci_softints & softiplmask;
 		KASSERT((softints != 0) == ((ci->ci_softints >> opl) != 0));
 		KASSERT(opl == IPL_NONE || (softints & (1 << (opl - IPL_SOFTCLOCK))) == 0);
 		if (softints == 0) {
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 			if (ci->ci_want_resched & RESCHED_KPREEMPT) {
 				ci->ci_want_resched &= ~RESCHED_KPREEMPT;
 				splsched();
 				kpreempt(-2);
+			}
 #endif
 			splx(opl);
 			return;
+		}
 #define	DOSOFTINT(n) \
 		if (ci->ci_softints & (1 << (IPL_SOFT ## n - IPL_SOFTCLOCK))) { \
 			ci->ci_softints &= \
 			    ~(1 << (IPL_SOFT ## n - IPL_SOFTCLOCK)); \
 @@ -322,27 +322,27 @@ cpu_kpreempt_enter(uintptr_t where, int
 		 * IPL_NONE so of course we call be preempted).
 		 */
 		return true;
+	}
 	/*
 	 * We are called from KPREEMPT_ENABLE().  If we are at IPL_NONE,
 	 * of course we can be preempted.  If we aren't, ask for a
 	 * softint so that kern_intr can call kpreempt.
 	 */
 	if (s == IPL_NONE) {
 		KASSERT(curcpu()->ci_mtx_count == 0);
 		return true;
+	}
-	atomic_or_uint(curcpu()->ci_want_resched, RESCHED_KPREEEMPT);
+	atomic_or_uint(curcpu()->ci_want_resched, RESCHED_KPREEMPT);
 #endif
 	return false;
+}
 void
 cpu_kpreempt_exit(uintptr_t where)
+{
 	/* do nothing */
+}
 /*
  * Return true if preemption is disabled for MD reasons.  Must be called

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ast.c,v 1.26 2015/04/08 18:10:08 matt Exp $	*/
+/*	$NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $	*/
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe
  * 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.
 @@ -31,27 +31,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * RiscBSD kernel project
+ *
  * ast.c
+ *
  * Code to handle ast's and returns to user mode
+ *
  * Created      : 11/10/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.26 2015/04/08 18:10:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.27 2015/04/14 22:36:53 jmcneill Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/userret.h>
 #include <sys/vmmeter.h>
 @@ -113,41 +113,41 @@ ast(struct trapframe *tf)
 #ifdef acorn26
 	/* Enable interrupts if they were enabled before the trap. */
 	if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
 		int_on();
 #else
 	/* Interrupts were restored by exception_exit. */
 #endif
 #ifdef __PROG32
 	KASSERT(VALID_R15_PSR(tf->tf_pc, tf->tf_spsr));
 #endif
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 	kpreempt_disable();
 #endif
 	struct cpu_info * const ci = curcpu();
 	ci->ci_data.cpu_ntrap++;
 	KDASSERT(ci->ci_cpl == IPL_NONE);
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 	atomic_and_uint(&ci->ci_astpending, ~__BIT(0));
 #else
 	ci->ci_astpending = 0;
 #endif
 	const int want_resched = ci->ci_want_resched;
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 	kpreempt_enable();
 #endif
 	if (l->l_pflag & LP_OWEUPC) {
 		l->l_pflag &= ~LP_OWEUPC;
 		ADDUPROF(l);
+	}
 	/* Allow a forced task switch. */
 	if (want_resched)
 		preempt();
 	userret(l);
+}

 @@ -209,27 +209,27 @@ static inline struct cpu_info *lwp_getcp
 // curcpu() expands into two instructions: a mrc and a ldr
 #define	curcpu()	lwp_getcpu(_curlwp())
 #elif defined(TPIDRPRW_IS_CURCPU)
 #ifdef __HAVE_PREEMPTION
 #error __HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP
 #endif
 static inline struct cpu_info *
 curcpu(void)
+{
 	return (struct cpu_info *) armreg_tpidrprw_read();
+}
 #elif !defined(MULTIPROCESSOR)
 #define	curcpu()	(&cpu_info_store)
-#elif !defined(__HAVE_PREEEMPTION)
+#elif !defined(__HAVE_PREEMPTION)
 #error MULTIPROCESSOR && !__HAVE_PREEMPTION requires TPIDRPRW_IS_CURCPU or TPIDRPRW_IS_CURLWP
 #else
 #error MULTIPROCESSOR && __HAVE_PREEMPTION requires TPIDRPRW_IS_CURLWP
 #endif /* !TPIDRPRW_IS_CURCPU && !TPIDRPRW_IS_CURLWP */
 #ifndef curlwp
 #define	curlwp		(curcpu()->ci_curlwp)
 #endif
 #define CPU_INFO_ITERATOR	int
 #if defined(MULTIPROCESSOR)
 extern struct cpu_info *cpu_info[];
 #define cpu_number()		(curcpu()->ci_index)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pic.c,v 1.32 2015/04/12 15:32:19 matt Exp $	*/
+/*	$NetBSD: pic.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * 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
 @@ -23,27 +23,27 @@
  * 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 "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.32 2015/04/12 15:32:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/xcall.h>
 #include <sys/ipi.h>
 #if defined(__arm__)
 #include <arm/armreg.h>
 @@ -546,27 +546,27 @@ pic_do_pending_ints(register_t psw, int
 			KASSERT(ipl < NIPL);
 			if (ipl <= newipl)
 				break;
 			pic_set_priority(ci, ipl);
 			pic_list_deliver_irqs(pend, psw, ipl, frame);
 			pic_list_unblock_irqs(pend);
+		}
+	}
 #ifdef MULTIPROCESSOR
 	percpu_putref(pic_pending_percpu);
 #endif
 #endif /* __HAVE_PIC_PENDING_INTRS */
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 	if (newipl == IPL_NONE && (ci->ci_astpending & __BIT(1))) {
 		pic_set_priority(ci, IPL_SCHED);
 		kpreempt(0);
+	}
 #endif
 	if (ci->ci_cpl != newipl)
 		pic_set_priority(ci, newipl);
+}
 static void
 pic_percpu_allocate(void *v0, void *v1, struct cpu_info *ci)
+{
 	struct pic_percpu * const pcpu = v0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipifuncs.c,v 1.7 2014/05/19 22:47:53 rmind Exp $	*/
+/*	$NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -22,27 +22,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.
  */
 #include "opt_ddb.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.7 2014/05/19 22:47:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.8 2015/04/14 22:36:53 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/xcall.h>
 #include <sys/ipi.h>
 #include <uvm/uvm_extern.h>
 #include <mips/cache.h>
 #include <mips/cpuset.h>
 #ifdef DDB
 @@ -74,27 +74,27 @@ ipi_nop(struct cpu_info *ci)
 static void
 ipi_shootdown(struct cpu_info *ci)
+{
 	pmap_tlb_shootdown_process();
+}
 static inline void
 ipi_syncicache(struct cpu_info *ci)
+{
 	pmap_tlb_syncicache_wanted(ci);
+}
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 static inline void
 ipi_kpreempt(struct cpu_info *ci)
+{
 	softint_trigger(SOFTINT_KPREEMPT);
+}
 #endif
 /*
  * Process cpu stop-self event.
  * XXX could maybe add/use locoresw halt function?
  */
 static void
 ipi_halt(void)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: e500_intr.c,v 1.32 2015/01/23 09:02:42 nonaka Exp $	*/
+/*	$NetBSD: e500_intr.c,v 1.33 2015/04/14 22:36:54 jmcneill 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
+ *
 @@ -31,27 +31,27 @@
  * 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_mpc85xx.h"
 #include "opt_multiprocessor.h"
 #include "opt_ddb.h"
 #define __INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.32 2015/01/23 09:02:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.33 2015/04/14 22:36:54 jmcneill Exp $");
 #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>
 #include <sys/xcall.h>
 #include <sys/ipi.h>
 #include <sys/bitops.h>
 #include <uvm/uvm_extern.h>
 @@ -1269,27 +1269,27 @@ e500_intr_cpu_send_ipi(cpuid_t target, u
 		KASSERTMSG(target == cpu_index(dst_ci),
 		    "%s: target (%lu) != cpu_index(cpu%u)",
 		     __func__, target, cpu_index(dst_ci));
 		dstmask = (1 << target);
 		if (ipimsg)
 			atomic_or_32(&dst_ci->ci_pending_ipis, ipimsg);
+	}
 	openpic_write(cpu, OPENPIC_IPIDR(0), dstmask);
+}
 typedef void (*ipifunc_t)(void);
-#ifdef __HAVE_PREEEMPTION
+#ifdef __HAVE_PREEMPTION
 static void
 e500_ipi_kpreempt(void)
+{
 	poowerpc_softint_trigger(1 << IPL_NONE);
+}
 #endif
 static void
 e500_ipi_suspend(void)
+{
 #ifdef MULTIPROCESSOR
 	cpu_pause(NULL);