Module Name: src
Committed By: skrll
Date: Sat Jun 20 07:10:36 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: arm11_pmc.c arm32_kvminit.c arm32_reboot.c
armv7_generic_space.c bus_dma.c cortex_pmc.c cpu.c db_interface.c
db_machdep.c fault.c intr.c kgdb_machdep.c kobj_machdep.c
netbsd32_machdep.c netbsd32_machdep_13.c netbsd32_machdep_16.c
stubs.c sys_machdep.c vm_machdep.c
Log Message:
KNF #includes
Remove some unnecessary ones while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm32/arm11_pmc.c \
src/sys/arch/arm/arm32/cortex_pmc.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/arm32/arm32_kvminit.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm32/arm32_reboot.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm32/armv7_generic_space.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/arm/arm32/bus_dma.c
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/arm/arm32/db_interface.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/arm32/db_machdep.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/arm32/intr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm32/kgdb_machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm32/kobj_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm32/netbsd32_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm32/netbsd32_machdep_13.c \
src/sys/arch/arm/arm32/netbsd32_machdep_16.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm32/stubs.c \
src/sys/arch/arm/arm32/sys_machdep.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/arm/arm32/vm_machdep.c
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/arm/arm32/arm11_pmc.c
diff -u src/sys/arch/arm/arm32/arm11_pmc.c:1.7 src/sys/arch/arm/arm32/arm11_pmc.c:1.8
--- src/sys/arch/arm/arm32/arm11_pmc.c:1.7 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/arm11_pmc.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm11_pmc.c,v 1.7 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: arm11_pmc.c,v 1.8 2020/06/20 07:10:36 skrll Exp $ */
/* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -34,14 +34,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm11_pmc.c,v 1.7 2020/06/20 07:01:16 skrll Exp $");
-#include <sys/types.h>
+__KERNEL_RCSID(0, "$NetBSD: arm11_pmc.c,v 1.8 2020/06/20 07:10:36 skrll Exp $");
+
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
#include <sys/kernel.h>
+#include <sys/systm.h>
#include <sys/time.h>
#include <sys/timetc.h>
+
#include <dev/clock_subr.h>
+
#include <arm/armreg.h>
#include <arm/cpufunc.h>
Index: src/sys/arch/arm/arm32/cortex_pmc.c
diff -u src/sys/arch/arm/arm32/cortex_pmc.c:1.7 src/sys/arch/arm/arm32/cortex_pmc.c:1.8
--- src/sys/arch/arm/arm32/cortex_pmc.c:1.7 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/arm/arm32/cortex_pmc.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cortex_pmc.c,v 1.7 2019/01/27 02:08:37 pgoyette Exp $ */
+/* $NetBSD: cortex_pmc.c,v 1.8 2020/06/20 07:10:36 skrll Exp $ */
/* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -35,11 +35,13 @@
*/
#include <sys/cdefs.h>
-/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.7 2019/01/27 02:08:37 pgoyette Exp $"); */
-#include <sys/types.h>
+/* __KERNEL_RCSID(0, "$NetBSD: cortex_pmc.c,v 1.8 2020/06/20 07:10:36 skrll Exp $"); */
+
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/types.h>
+
#include <sys/kernel.h>
+#include <sys/systm.h>
#include <sys/time.h>
#include <sys/timetc.h>
Index: src/sys/arch/arm/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.58 src/sys/arch/arm/arm32/arm32_kvminit.c:1.59
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.58 Tue Feb 4 10:59:21 2020
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.58 2020/02/04 10:59:21 skrll Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.59 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -127,9 +127,10 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.58 2020/02/04 10:59:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.59 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
#include <sys/bus.h>
#include <sys/device.h>
#include <sys/kernel.h>
Index: src/sys/arch/arm/arm32/arm32_reboot.c
diff -u src/sys/arch/arm/arm32/arm32_reboot.c:1.12 src/sys/arch/arm/arm32/arm32_reboot.c:1.13
--- src/sys/arch/arm/arm32/arm32_reboot.c:1.12 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/arm32_reboot.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_reboot.c,v 1.12 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: arm32_reboot.c,v 1.13 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,15 +122,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.12 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_reboot.c,v 1.13 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
+#include <dev/cons.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/reboot.h>
-#include <dev/cons.h>
-
#include <uvm/uvm_extern.h>
#include <arm/locore.h>
Index: src/sys/arch/arm/arm32/armv7_generic_space.c
diff -u src/sys/arch/arm/arm32/armv7_generic_space.c:1.11 src/sys/arch/arm/arm32/armv7_generic_space.c:1.12
--- src/sys/arch/arm/arm32/armv7_generic_space.c:1.11 Wed Feb 5 07:37:35 2020
+++ src/sys/arch/arm/arm32/armv7_generic_space.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armv7_generic_space.c,v 1.11 2020/02/05 07:37:35 skrll Exp $ */
+/* $NetBSD: armv7_generic_space.c,v 1.12 2020/06/20 07:10:36 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,15 +31,15 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.11 2020/02/05 07:37:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armv7_generic_space.c,v 1.12 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
+#include <sys/bus.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <sys/bus.h>
-
/* Prototypes for all the bus_space structure functions */
bs_protos(armv7_generic);
bs_protos(armv7_generic_a4x);
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.121 src/sys/arch/arm/arm32/bus_dma.c:1.122
--- src/sys/arch/arm/arm32/bus_dma.c:1.121 Sat Mar 14 18:08:38 2020
+++ src/sys/arch/arm/arm32/bus_dma.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.121 2020/03/14 18:08:38 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.122 2020/06/20 07:10:36 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,9 +36,10 @@
#include "opt_cputypes.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.121 2020/03/14 18:08:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.122 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
#include <sys/bus.h>
#include <sys/cpu.h>
#include <sys/kmem.h>
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.144 src/sys/arch/arm/arm32/cpu.c:1.145
--- src/sys/arch/arm/arm32/cpu.c:1.144 Sat Feb 15 08:16:11 2020
+++ src/sys/arch/arm/arm32/cpu.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.144 2020/02/15 08:16:11 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.145 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,9 +46,10 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.144 2020/02/15 08:16:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.145 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
#include <sys/conf.h>
#include <sys/cpu.h>
#include <sys/device.h>
Index: src/sys/arch/arm/arm32/db_interface.c
diff -u src/sys/arch/arm/arm32/db_interface.c:1.59 src/sys/arch/arm/arm32/db_interface.c:1.60
--- src/sys/arch/arm/arm32/db_interface.c:1.59 Sun Jul 21 16:12:59 2019
+++ src/sys/arch/arm/arm32/db_interface.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.59 2019/07/21 16:12:59 rin Exp $ */
+/* $NetBSD: db_interface.c,v 1.60 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,19 +35,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.59 2019/07/21 16:12:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.60 2020/06/20 07:10:36 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
+
+#include <sys/atomic.h>
+#include <sys/exec.h>
+#include <sys/intr.h>
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/systm.h> /* just for boothowto */
-#include <sys/exec.h>
-#include <sys/atomic.h>
-#include <sys/intr.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/arm32/db_machdep.c
diff -u src/sys/arch/arm/arm32/db_machdep.c:1.30 src/sys/arch/arm/arm32/db_machdep.c:1.31
--- src/sys/arch/arm/arm32/db_machdep.c:1.30 Tue Apr 14 08:06:53 2020
+++ src/sys/arch/arm/arm32/db_machdep.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.30 2020/04/14 08:06:53 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.31 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -34,9 +34,10 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.30 2020/04/14 08:06:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.31 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
+
#include <sys/cpu.h>
#include <sys/proc.h>
#include <sys/vnode.h>
Index: src/sys/arch/arm/arm32/fault.c
diff -u src/sys/arch/arm/arm32/fault.c:1.111 src/sys/arch/arm/arm32/fault.c:1.112
--- src/sys/arch/arm/arm32/fault.c:1.111 Sun Mar 29 09:10:26 2020
+++ src/sys/arch/arm/arm32/fault.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fault.c,v 1.111 2020/03/29 09:10:26 skrll Exp $ */
+/* $NetBSD: fault.c,v 1.112 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -81,15 +81,16 @@
#include "opt_kgdb.h"
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.111 2020/03/29 09:10:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.112 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/kauth.h>
+
#include <sys/cpu.h>
#include <sys/intr.h>
+#include <sys/kauth.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
#include <uvm/uvm_stat.h>
Index: src/sys/arch/arm/arm32/intr.c
diff -u src/sys/arch/arm/arm32/intr.c:1.35 src/sys/arch/arm/arm32/intr.c:1.36
--- src/sys/arch/arm/arm32/intr.c:1.35 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/intr.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.35 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: intr.c,v 1.36 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.35 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.36 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+
#include <sys/conf.h>
#include <sys/cpu.h>
#include <sys/intr.h>
-#include <sys/syslog.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/arm32/kgdb_machdep.c
diff -u src/sys/arch/arm/arm32/kgdb_machdep.c:1.8 src/sys/arch/arm/arm32/kgdb_machdep.c:1.9
--- src/sys/arch/arm/arm32/kgdb_machdep.c:1.8 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/kgdb_machdep.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.8 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.9 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1996 Matthias Pfaller.
@@ -26,14 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.8 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.9 2020/06/20 07:10:36 skrll Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include <sys/param.h>
-#include <sys/systm.h>
+
#include <sys/kgdb.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
Index: src/sys/arch/arm/arm32/kobj_machdep.c
diff -u src/sys/arch/arm/arm32/kobj_machdep.c:1.13 src/sys/arch/arm/arm32/kobj_machdep.c:1.14
--- src/sys/arch/arm/arm32/kobj_machdep.c:1.13 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/kobj_machdep.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_machdep.c,v 1.13 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: kobj_machdep.c,v 1.14 2020/06/20 07:10:36 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -52,18 +52,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.13 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.14 2020/06/20 07:10:36 skrll Exp $");
#define ELFSIZE ARCH_ELFSIZE
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kobj.h>
+
#include <sys/exec.h>
#include <sys/exec_elf.h>
#include <sys/kmem.h>
-#include <sys/ksyms.h>
+#include <sys/kobj.h>
#include <sys/kobj_impl.h>
+#include <sys/ksyms.h>
+#include <sys/systm.h>
#include <arm/cpufunc.h>
#include <arm/locore.h>
Index: src/sys/arch/arm/arm32/netbsd32_machdep.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep.c:1.10 src/sys/arch/arm/arm32/netbsd32_machdep.c:1.11
--- src/sys/arch/arm/arm32/netbsd32_machdep.c:1.10 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/netbsd32_machdep.c Sat Jun 20 07:10:36 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.10 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep.c,v 1.11 2020/06/20 07:10:36 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -37,6 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: netbsd32_mac
#endif
#include <sys/param.h>
+
#include <sys/core.h>
#include <sys/exec.h>
#include <sys/lwp.h>
Index: src/sys/arch/arm/arm32/netbsd32_machdep_13.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.4 src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.5
--- src/sys/arch/arm/arm32/netbsd32_machdep_13.c:1.4 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/netbsd32_machdep_13.c Sat Jun 20 07:10:36 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_13.c,v 1.4 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_13.c,v 1.5 2020/06/20 07:10:36 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -37,6 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: netbsd32_mac
#endif
#include <sys/param.h>
+
#include <sys/core.h>
#include <sys/exec.h>
#include <sys/lwp.h>
Index: src/sys/arch/arm/arm32/netbsd32_machdep_16.c
diff -u src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.4 src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.5
--- src/sys/arch/arm/arm32/netbsd32_machdep_16.c:1.4 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/netbsd32_machdep_16.c Sat Jun 20 07:10:36 2020
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_16.c,v 1.4 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netbsd32_machdep_16.c,v 1.5 2020/06/20 07:10:36 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -37,6 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: netbsd32_mac
#endif
#include <sys/param.h>
+
#include <sys/core.h>
#include <sys/exec.h>
#include <sys/lwp.h>
Index: src/sys/arch/arm/arm32/stubs.c
diff -u src/sys/arch/arm/arm32/stubs.c:1.24 src/sys/arch/arm/arm32/stubs.c:1.25
--- src/sys/arch/arm/arm32/stubs.c:1.24 Mon Nov 12 18:00:35 2012
+++ src/sys/arch/arm/arm32/stubs.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: stubs.c,v 1.24 2012/11/12 18:00:35 skrll Exp $ */
+/* $NetBSD: stubs.c,v 1.25 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -41,24 +41,27 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.24 2012/11/12 18:00:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.25 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/proc.h>
+
#include <sys/conf.h>
+#include <sys/core.h>
+#include <sys/errno.h>
+#include <sys/kcore.h>
#include <sys/msgbuf.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+
#include <uvm/uvm_extern.h>
+
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
#include <machine/pcb.h>
+
#include <arm/arm32/machdep.h>
#include <arm/kcore.h>
-#include <sys/kcore.h>
-#include <sys/core.h>
-#include <sys/exec_aout.h>
extern dev_t dumpdev;
Index: src/sys/arch/arm/arm32/sys_machdep.c
diff -u src/sys/arch/arm/arm32/sys_machdep.c:1.24 src/sys/arch/arm/arm32/sys_machdep.c:1.25
--- src/sys/arch/arm/arm32/sys_machdep.c:1.24 Sat Jun 20 07:01:16 2020
+++ src/sys/arch/arm/arm32/sys_machdep.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.24 2020/06/20 07:01:16 skrll Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.25 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1995-1997 Mark Brinicombe.
@@ -41,17 +41,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.24 2020/06/20 07:01:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_machdep.c,v 1.25 2020/06/20 07:10:36 skrll Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/mbuf.h>
-#include <sys/mount.h>
+
#include <sys/cpu.h>
-#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
+#include <sys/proc.h>
#include <sys/syscallargs.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <uvm/uvm_extern.h>
#include <machine/sysarch.h>
#include <machine/pcb.h>
Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.76 src/sys/arch/arm/arm32/vm_machdep.c:1.77
--- src/sys/arch/arm/arm32/vm_machdep.c:1.76 Sat Apr 18 11:00:37 2020
+++ src/sys/arch/arm/arm32/vm_machdep.c Sat Jun 20 07:10:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.76 2020/04/18 11:00:37 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.77 2020/06/20 07:10:36 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,20 +44,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.76 2020/04/18 11:00:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.77 2020/06/20 07:10:36 skrll Exp $");
#include "opt_armfpe.h"
#include "opt_cputypes.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/vnode.h>
-#include <sys/cpu.h>
+
#include <sys/buf.h>
+#include <sys/cpu.h>
#include <sys/exec.h>
-#include <sys/syslog.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
#include <uvm/uvm_extern.h>
