[src/trunk]: src/sys/arch/arm/arm32 KNF #includes

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

details:   https://anonhg.NetBSD.org/src/rev/3fa6d2e8462d
branches:  trunk
changeset: 934807:3fa6d2e8462d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jun 20 07:10:36 2020 +0000

description:
KNF #includes

Remove some unnecessary ones while I'm here.

diffstat:

 sys/arch/arm/arm32/arm11_pmc.c           |  12 ++++++++----
 sys/arch/arm/arm32/arm32_kvminit.c       |   5 +++--
 sys/arch/arm/arm32/arm32_reboot.c        |   8 ++++----
 sys/arch/arm/arm32/armv7_generic_space.c |   8 ++++----
 sys/arch/arm/arm32/bus_dma.c             |   5 +++--
 sys/arch/arm/arm32/cortex_pmc.c          |  10 ++++++----
 sys/arch/arm/arm32/cpu.c                 |   5 +++--
 sys/arch/arm/arm32/db_interface.c        |  11 ++++++-----
 sys/arch/arm/arm32/db_machdep.c          |   5 +++--
 sys/arch/arm/arm32/fault.c               |  13 +++++++------
 sys/arch/arm/arm32/intr.c                |   8 ++++----
 sys/arch/arm/arm32/kgdb_machdep.c        |   7 ++++---
 sys/arch/arm/arm32/kobj_machdep.c        |  11 ++++++-----
 sys/arch/arm/arm32/netbsd32_machdep.c    |   3 ++-
 sys/arch/arm/arm32/netbsd32_machdep_13.c |   3 ++-
 sys/arch/arm/arm32/netbsd32_machdep_16.c |   3 ++-
 sys/arch/arm/arm32/stubs.c               |  19 +++++++++++--------
 sys/arch/arm/arm32/sys_machdep.c         |  16 ++++++++--------
 sys/arch/arm/arm32/vm_machdep.c          |  15 +++++++--------
 19 files changed, 93 insertions(+), 74 deletions(-)

diffs (truncated from 523 to 300 lines):

diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/arm11_pmc.c
--- a/sys/arch/arm/arm32/arm11_pmc.c    Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/arm11_pmc.c    Sat Jun 20 07:10:36 2020 +0000
@@ -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/types.h>
+
+#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
+
 #include <dev/clock_subr.h>
+
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/arm32_kvminit.c
--- a/sys/arch/arm/arm32/arm32_kvminit.c        Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/arm32_kvminit.c        Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/arm32_reboot.c
--- a/sys/arch/arm/arm32/arm32_reboot.c Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/arm32_reboot.c Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/armv7_generic_space.c
--- a/sys/arch/arm/arm32/armv7_generic_space.c  Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/armv7_generic_space.c  Sat Jun 20 07:10:36 2020 +0000
@@ -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);
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/cortex_pmc.c
--- a/sys/arch/arm/arm32/cortex_pmc.c   Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/cortex_pmc.c   Sat Jun 20 07:10:36 2020 +0000
@@ -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/types.h>
+
+#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/db_interface.c
--- a/sys/arch/arm/arm32/db_interface.c Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/db_interface.c Sat Jun 20 07:10:36 2020 +0000
@@ -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>
 
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/db_machdep.c
--- a/sys/arch/arm/arm32/db_machdep.c   Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/db_machdep.c   Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/fault.c
--- a/sys/arch/arm/arm32/fault.c        Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/fault.c        Sat Jun 20 07:10:36 2020 +0000
@@ -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>
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/intr.c
--- a/sys/arch/arm/arm32/intr.c Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/intr.c Sat Jun 20 07:10:36 2020 +0000
@@ -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>
 
diff -r a48ae971182c -r 3fa6d2e8462d sys/arch/arm/arm32/kgdb_machdep.c
--- a/sys/arch/arm/arm32/kgdb_machdep.c Sat Jun 20 07:01:16 2020 +0000
+++ b/sys/arch/arm/arm32/kgdb_machdep.c Sat Jun 20 07:10:36 2020 +0000
@@ -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 @@
  */