[src/trunk]: src/sys/arch Simplify the cpufunc.h header, i.e. always use #inc...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c14f966f7936
branches:  trunk
changeset: 945134:c14f966f7936
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 22 07:23:24 2020 +0000

description:
Simplify the cpufunc.h header, i.e. always use #include <arm/cpufunc.h>

diffstat:

 sys/arch/aarch64/aarch64/aarch64_machdep.c |  7 ++++---
 sys/arch/aarch64/aarch64/cpufunc.c         |  6 +++---
 sys/arch/aarch64/aarch64/db_machdep.c      |  7 ++++---
 sys/arch/aarch64/aarch64/efi_machdep.c     |  7 ++++---
 sys/arch/aarch64/aarch64/fpu.c             |  5 +++--
 sys/arch/aarch64/aarch64/trap.c            |  7 ++++---
 sys/arch/evbarm/include/cpufunc.h          |  6 +-----
 7 files changed, 23 insertions(+), 22 deletions(-)

diffs (181 lines):

diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/aarch64_machdep.c
--- a/sys/arch/aarch64/aarch64/aarch64_machdep.c        Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/aarch64_machdep.c        Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.51 2020/10/04 08:09:12 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.52 2020/10/22 07:23:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.51 2020/10/04 08:09:12 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.52 2020/10/22 07:23:24 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
@@ -59,8 +59,9 @@
 
 #include <machine/bootconfig.h>
 
+#include <arm/cpufunc.h>
+
 #include <aarch64/armreg.h>
-#include <aarch64/cpufunc.h>
 #ifdef DDB
 #include <aarch64/db_machdep.h>
 #endif
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/cpufunc.c
--- a/sys/arch/aarch64/aarch64/cpufunc.c        Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/cpufunc.c        Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.24 2020/08/02 06:58:16 maxv Exp $        */
+/*     $NetBSD: cpufunc.c,v 1.25 2020/10/22 07:23:24 skrll Exp $       */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -30,7 +30,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.24 2020/08/02 06:58:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.25 2020/10/22 07:23:24 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -40,7 +40,7 @@
 #include <uvm/uvm.h>
 #include <uvm/uvm_page.h>
 
-#include <aarch64/cpufunc.h>
+#include <arm/cpufunc.h>
 
 u_int cputype;                 /* compat arm */
 u_int arm_dcache_align;                /* compat arm */
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/db_machdep.c
--- a/sys/arch/aarch64/aarch64/db_machdep.c     Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/db_machdep.c     Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.26 2020/08/12 13:19:35 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.27 2020/10/22 07:23:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.26 2020/08/12 13:19:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.27 2020/10/22 07:23:24 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -45,9 +45,10 @@
 
 #include <uvm/uvm.h>
 
+#include <arm/cpufunc.h>
+
 #include <aarch64/db_machdep.h>
 #include <aarch64/armreg.h>
-#include <aarch64/cpufunc.h>
 #include <aarch64/locore.h>
 #include <aarch64/pmap.h>
 
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/efi_machdep.c
--- a/sys/arch/aarch64/aarch64/efi_machdep.c    Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/efi_machdep.c    Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_machdep.c,v 1.6 2020/07/16 11:36:35 skrll Exp $ */
+/* $NetBSD: efi_machdep.c,v 1.7 2020/10/22 07:23:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,11 +30,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.6 2020/07/16 11:36:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.7 2020/10/22 07:23:24 skrll Exp $");
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
-#include <machine/cpufunc.h>
+
+#include <arm/cpufunc.h>
 
 #include <arm/arm/efi_runtime.h>
 
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/fpu.c
--- a/sys/arch/aarch64/aarch64/fpu.c    Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/fpu.c    Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.8 2020/08/01 02:06:59 riastradh Exp $ */
+/* $NetBSD: fpu.c,v 1.9 2020/10/22 07:23:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.8 2020/08/01 02:06:59 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.9 2020/10/22 07:23:24 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -41,6 +41,7 @@
 #include <sys/evcnt.h>
 
 #include <arm/fpu.h>
+#include <arm/cpufunc.h>
 
 #include <aarch64/locore.h>
 #include <aarch64/reg.h>
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c   Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c   Thu Oct 22 07:23:24 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.38 2020/10/15 23:15:36 rin Exp $ */
+/* $NetBSD: trap.c,v 1.39 2020/10/22 07:23:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.38 2020/10/15 23:15:36 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.39 2020/10/22 07:23:24 skrll Exp $");
 
 #include "opt_arm_intr_impl.h"
 #include "opt_compat_netbsd32.h"
@@ -63,12 +63,13 @@
 #error ARM_IRQ_HANDLER not defined
 #endif
 
+#include <arm/cpufunc.h>
+
 #include <aarch64/userret.h>
 #include <aarch64/frame.h>
 #include <aarch64/machdep.h>
 #include <aarch64/armreg.h>
 #include <aarch64/locore.h>
-#include <aarch64/cpufunc.h>
 
 #ifdef KDB
 #include <machine/db_machdep.h>
diff -r 79972d7fed1f -r c14f966f7936 sys/arch/evbarm/include/cpufunc.h
--- a/sys/arch/evbarm/include/cpufunc.h Thu Oct 22 07:16:06 2020 +0000
+++ b/sys/arch/evbarm/include/cpufunc.h Thu Oct 22 07:23:24 2020 +0000
@@ -1,7 +1,3 @@
-/* $NetBSD: cpufunc.h,v 1.1 2018/10/12 22:09:04 jmcneill Exp $ */
+/* $NetBSD: cpufunc.h,v 1.2 2020/10/22 07:23:24 skrll Exp $ */
 
-#ifdef __aarch64__
-#include <aarch64/cpufunc.h>
-#else
 #include <arm/cpufunc.h>
-#endif