Module Name: src
Committed By: skrll
Date: Thu Oct 22 07:23:25 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c cpufunc.c db_machdep.c
efi_machdep.c fpu.c trap.c
src/sys/arch/evbarm/include: cpufunc.h
Log Message:
Simplify the cpufunc.h header, i.e. always use #include <arm/cpufunc.h>
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/aarch64/aarch64/cpufunc.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/efi_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/fpu.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/trap.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/include/cpufunc.h
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/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.51 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.52
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.51 Sun Oct 4 08:09:12 2020
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Thu Oct 22 07:23:24 2020
@@ -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 @@ __KERNEL_RCSID(1, "$NetBSD: aarch64_mach
#include <machine/bootconfig.h>
+#include <arm/cpufunc.h>
+
#include <aarch64/armreg.h>
-#include <aarch64/cpufunc.h>
#ifdef DDB
#include <aarch64/db_machdep.h>
#endif
Index: src/sys/arch/aarch64/aarch64/cpufunc.c
diff -u src/sys/arch/aarch64/aarch64/cpufunc.c:1.24 src/sys/arch/aarch64/aarch64/cpufunc.c:1.25
--- src/sys/arch/aarch64/aarch64/cpufunc.c:1.24 Sun Aug 2 06:58:16 2020
+++ src/sys/arch/aarch64/aarch64/cpufunc.c Thu Oct 22 07:23:24 2020
@@ -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 <r...@nerv.org>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v
#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 */
Index: src/sys/arch/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.26 src/sys/arch/aarch64/aarch64/db_machdep.c:1.27
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.26 Wed Aug 12 13:19:35 2020
+++ src/sys/arch/aarch64/aarch64/db_machdep.c Thu Oct 22 07:23:24 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: db_machdep.c
#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>
Index: src/sys/arch/aarch64/aarch64/efi_machdep.c
diff -u src/sys/arch/aarch64/aarch64/efi_machdep.c:1.6 src/sys/arch/aarch64/aarch64/efi_machdep.c:1.7
--- src/sys/arch/aarch64/aarch64/efi_machdep.c:1.6 Thu Jul 16 11:36:35 2020
+++ src/sys/arch/aarch64/aarch64/efi_machdep.c Thu Oct 22 07:23:24 2020
@@ -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>
Index: src/sys/arch/aarch64/aarch64/fpu.c
diff -u src/sys/arch/aarch64/aarch64/fpu.c:1.8 src/sys/arch/aarch64/aarch64/fpu.c:1.9
--- src/sys/arch/aarch64/aarch64/fpu.c:1.8 Sat Aug 1 02:06:59 2020
+++ src/sys/arch/aarch64/aarch64/fpu.c Thu Oct 22 07:23:24 2020
@@ -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 @@ __KERNEL_RCSID(1, "$NetBSD: fpu.c,v 1.8
#include <sys/evcnt.h>
#include <arm/fpu.h>
+#include <arm/cpufunc.h>
#include <aarch64/locore.h>
#include <aarch64/reg.h>
Index: src/sys/arch/aarch64/aarch64/trap.c
diff -u src/sys/arch/aarch64/aarch64/trap.c:1.38 src/sys/arch/aarch64/aarch64/trap.c:1.39
--- src/sys/arch/aarch64/aarch64/trap.c:1.38 Thu Oct 15 23:15:36 2020
+++ src/sys/arch/aarch64/aarch64/trap.c Thu Oct 22 07:23:24 2020
@@ -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 @@ __KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.3
#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>
Index: src/sys/arch/evbarm/include/cpufunc.h
diff -u src/sys/arch/evbarm/include/cpufunc.h:1.1 src/sys/arch/evbarm/include/cpufunc.h:1.2
--- src/sys/arch/evbarm/include/cpufunc.h:1.1 Fri Oct 12 22:09:04 2018
+++ src/sys/arch/evbarm/include/cpufunc.h Thu Oct 22 07:23:24 2020
@@ -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
