 @@ -1,14 +1,14 @@
-/*	$NetBSD: hppa_machdep.c,v 1.30 2019/11/23 19:40:35 ad Exp $	*/
+/*	$NetBSD: hppa_machdep.c,v 1.31 2020/04/16 09:28:52 skrll Exp $	*/
 /*-
  * Copyright (c) 1997, 2019 The NetBSD Foundation, Inc.
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 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(0, "$NetBSD: hppa_machdep.c,v 1.30 2019/11/23 19:40:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.31 2020/04/16 09:28:52 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpufunc.h>
 @@ -293,13 +293,28 @@ hppa_ras(struct lwp *l)
  */
 void
 cpu_need_resched(struct cpu_info *ci, struct lwp *l, int flags)
+{
 	if ((flags & RESCHED_REMOTE) != 0) {
 #ifdef MULTIPROCESSOR
 		/* XXX send IPI */
 #endif
 	} else {
 		setsoftast(l);
+	}
+}
 #ifdef MODULAR
 struct lwp *
 hppa_curlwp(void)
+{
 	return curlwp;
+}
 struct cpu_info *
 hppa_curcpu(void)
+{
 	return curcpu();
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.9 2019/12/05 08:00:05 skrll Exp $	*/
+/*	$NetBSD: cpu.h,v 1.10 2020/04/16 09:28:52 skrll Exp $	*/
 /*	$OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $	*/
 /*
  * Copyright (c) 2000-2004 Michael Shalayeff
  * 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
 @@ -306,69 +306,79 @@ struct cpu_info {
 #endif /* _KERNEL || _KMEMUSER */
 #endif /* __ASSEMBLER__ */
 #if defined(_KERNEL)
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
 void	cpu_proc_fork(struct proc *, struct proc *);
-#ifdef MULTIPROCESSOR
+struct lwp *hppa_curlwp(void);
 struct cpu_info *hppa_curcpu(void);
 #if defined(_MODULE)
 #define	curcpu()			hppa_curcpu()
 #define	curlwp				hppa_curlwp()
 #endif
 #if defined(MULTIPROCESSOR) || defined(_MODULE)
 /* Number of CPUs in the system */
 extern int hppa_ncpu;
 #define	HPPA_MAXCPUS	4
 #define	cpu_number()			(curcpu()->ci_cpuid)
 #define	CPU_IS_PRIMARY(ci)		((ci)->ci_cpuid == 0)
 #define	CPU_INFO_ITERATOR		int
 #define	CPU_INFO_FOREACH(cii, ci)	cii = 0, ci =  &cpus[0]; cii < hppa_ncpu; cii++, ci++
 void	cpu_boot_secondary_processors(void);
 #if !defined(_MODULE)
 static __inline struct cpu_info *
-hppa_curcpu(void)
+_hppa_curcpu(void)
+{
 	struct cpu_info *ci;
 	__asm volatile("mfctl %1, %0" : "=r" (ci): "i" (CR_CURCPU));
 	return ci;
+}
-#define	curcpu()			hppa_curcpu()
+#define	curcpu()			_hppa_curcpu()
 #endif
 #else /*  MULTIPROCESSOR */
 #define	HPPA_MAXCPUS	1
 #define	curcpu()			(&cpus[0])
 #define	cpu_number()			0
 static __inline struct lwp *
-hppa_curlwp(void)
+_hppa_curlwp(void)
+{
 	struct lwp *l;
 	__asm volatile("mfctl %1, %0" : "=r" (l): "i" (CR_CURLWP));
 	return l;
+}
-#define	curlwp				hppa_curlwp()
+#define	curlwp				_hppa_curlwp()
 #endif /* MULTIPROCESSOR */
 extern struct cpu_info cpus[HPPA_MAXCPUS];
 #define	DELAY(x) delay(x)
 static __inline paddr_t
 kvtop(const void *va)
+{
 	paddr_t pa;
 	__asm volatile ("lpa %%r0(%1), %0" : "=r" (pa) : "r" (va));