[src/trunk]: src/sys/arch Cleanup includes. (<net/netisr.h> is handled by so...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Cleanup includes. (<net/netisr.h> is handled by so...
From: matt <matt%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:38:20 +0000
details:   https://anonhg.NetBSD.org/src/rev/0e68f1d4d71b
branches:  trunk
changeset: 766283:0e68f1d4d71b
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 20 07:18:05 2011 +0000

description:
Cleanup includes.  (<net/netisr.h> is handled by softints, not MD anymore,
so this can be nuked).

diffstat:

 sys/arch/bebox/bebox/machdep.c         |  21 ++++++++++---------
 sys/arch/evbppc/ev64260/machdep.c      |  11 ++++-----
 sys/arch/evbppc/pmppc/machdep.c        |  25 +++++++++++------------
 sys/arch/evbppc/virtex/machdep.c       |  25 +++++++++++------------
 sys/arch/evbppc/walnut/machdep.c       |  27 ++++++++++++-------------
 sys/arch/ibmnws/ibmnws/machdep.c       |  25 +++++++++++------------
 sys/arch/macppc/macppc/machdep.c       |  35 ++++++++++++++++-----------------
 sys/arch/mvmeppc/mvmeppc/machdep.c     |  16 ++++++--------
 sys/arch/powerpc/oea/oea_machdep.c     |  15 ++++++-------
 sys/arch/prep/prep/machdep.c           |  22 +++++++++-----------
 sys/arch/prep/prep/platform.c          |  13 ++++++-----
 sys/arch/rs6000/rs6000/machdep.c       |  25 ++++++++++-------------
 sys/arch/sandpoint/sandpoint/machdep.c |  25 +++++++++++------------
 13 files changed, 136 insertions(+), 149 deletions(-)

diffs (truncated from 818 to 300 lines):

diff -r d2d14013acc3 -r 0e68f1d4d71b sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c    Mon Jun 20 06:52:36 2011 +0000
+++ b/sys/arch/bebox/bebox/machdep.c    Mon Jun 20 07:18:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.99 2010/10/30 06:11:18 kiyohara Exp $    */
+/*     $NetBSD: machdep.c,v 1.100 2011/06/20 07:18:05 matt Exp $       */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,19 +32,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2010/10/30 06:11:18 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.100 2011/06/20 07:18:05 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 
+#define _POWERPC_BUS_DMA_PRIVATE
+
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/extent.h>
+#include <sys/intr.h>
 #include <sys/kernel.h>
+#include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
@@ -54,20 +59,16 @@
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <sys/ksyms.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
-
 #include <machine/bootinfo.h>
 #include <machine/autoconf.h>
-#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/pmap.h>
 #include <machine/powerpc.h>
-#include <machine/trap.h>
+
+#include <powerpc/pmap.h>
+#include <powerpc/psl.h>
+#include <powerpc/trap.h>
 
 #include <powerpc/oea/bat.h>
 #include <powerpc/pic/picvar.h> 
diff -r d2d14013acc3 -r 0e68f1d4d71b sys/arch/evbppc/ev64260/machdep.c
--- a/sys/arch/evbppc/ev64260/machdep.c Mon Jun 20 06:52:36 2011 +0000
+++ b/sys/arch/evbppc/ev64260/machdep.c Mon Jun 20 07:18:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.28 2010/12/20 00:25:32 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.29 2011/06/20 07:18:06 matt Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2010/12/20 00:25:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2011/06/20 07:18:06 matt Exp $");
 
 #include "opt_marvell.h"
 #include "opt_modular.h"
@@ -62,11 +62,10 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
+#include <machine/powerpc.h>
 
-#include <machine/db_machdep.h>
-#include <machine/pmap.h>
-#include <machine/powerpc.h>
+#include <powerpc/db_machdep.h>
+#include <powerpc/pmap.h>
 
 #include <powerpc/oea/bat.h>
 #include <powerpc/pic/picvar.h>
diff -r d2d14013acc3 -r 0e68f1d4d71b sys/arch/evbppc/pmppc/machdep.c
--- a/sys/arch/evbppc/pmppc/machdep.c   Mon Jun 20 06:52:36 2011 +0000
+++ b/sys/arch/evbppc/pmppc/machdep.c   Mon Jun 20 07:18:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.10 2010/12/20 00:25:32 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.11 2011/06/20 07:18:06 matt Exp $        */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2010/12/20 00:25:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2011/06/20 07:18:06 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -74,12 +74,15 @@
 
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/extent.h>
+#include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/kgdb.h>
+#include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
@@ -87,26 +90,22 @@
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/syscallargs.h>
+#include <sys/sysctl.h>
 #include <sys/syslog.h>
-#include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/ksyms.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
-
-#include <machine/bus.h>
-#include <machine/db_machdep.h>
-#include <machine/intr.h>
-#include <machine/pio.h>
-#include <machine/pmap.h>
 #include <machine/powerpc.h>
-#include <machine/trap.h>
 #include <machine/pmppc.h>
 
+#include <powerpc/db_machdep.h>
+#include <powerpc/pio.h>
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
+
 #include <powerpc/oea/bat.h>
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
 
 #include <ddb/db_extern.h>
 
diff -r d2d14013acc3 -r 0e68f1d4d71b sys/arch/evbppc/virtex/machdep.c
--- a/sys/arch/evbppc/virtex/machdep.c  Mon Jun 20 06:52:36 2011 +0000
+++ b/sys/arch/evbppc/virtex/machdep.c  Mon Jun 20 07:18:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.18 2011/06/18 06:44:27 matt Exp $ */
+/*     $NetBSD: machdep.c,v 1.19 2011/06/20 07:18:06 matt Exp $ */
 
 /*
  * Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2011/06/18 06:44:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2011/06/20 07:18:06 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -44,33 +44,32 @@
 #include "opt_kgdb.h"
 
 #include <sys/param.h>
+#include <sys/boot_flag.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
+#include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/boot_flag.h>
-#include <sys/ksyms.h>
-#include <sys/device.h>
-#include <sys/module.h>
-#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
-
 #include <dev/cons.h>
 
 #include <machine/powerpc.h>
-#include <machine/trap.h>
-#include <machine/pcb.h>
+
+#include <powerpc/trap.h>
+#include <powerpc/pcb.h>
 
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
@@ -83,7 +82,7 @@
 #include "ksyms.h"
 
 #if defined(DDB)
-#include <machine/db_machdep.h>
+#include <powerpc/db_machdep.h>
 #include <ddb/db_extern.h>
 #endif
 
diff -r d2d14013acc3 -r 0e68f1d4d71b sys/arch/evbppc/walnut/machdep.c
--- a/sys/arch/evbppc/walnut/machdep.c  Mon Jun 20 06:52:36 2011 +0000
+++ b/sys/arch/evbppc/walnut/machdep.c  Mon Jun 20 07:18:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.51 2011/06/18 06:44:28 matt Exp $        */
+/*     $NetBSD: machdep.c,v 1.52 2011/06/20 07:18:06 matt Exp $        */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2011/06/18 06:44:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2011/06/20 07:18:06 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -75,10 +75,17 @@
 #include "opt_modular.h"
 
 #include <sys/param.h>
+#include <sys/boot_flag.h>
 #include <sys/buf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/exec.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
 #include <sys/proc.h>
@@ -86,24 +93,16 @@
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/boot_flag.h>
-#include <sys/ksyms.h>
-#include <sys/device.h>
-#include <sys/module.h>
-#include <sys/cpu.h>
-#include <sys/bus.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <net/netisr.h>
-
 #include <prop/proplib.h>
 
 #include <machine/powerpc.h>
-#include <machine/trap.h>
 #include <machine/walnut.h>
-#include <machine/pcb.h>
+
+#include <powerpc/trap.h>
+#include <powerpc/pcb.h>
 
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
@@ -117,7 +116,7 @@
 #include "ksyms.h"
 
 #if defined(DDB)
-#include <machine/db_machdep.h>
Prev by Date: [src/trunk]: src/external/lgpl3/gmp/dist initial import of GMP 5.0.2.
Next by Date: [src/trunk]: src remove all the code that supported HAVE_GCC=3. mostly from ...
Previous by Thread: [src/trunk]: src/external/lgpl3/gmp/dist initial import of GMP 5.0.2.
Next by Thread: [src/trunk]: src remove all the code that supported HAVE_GCC=3. mostly from ...
Indexes:
Home | Main Index | Thread Index | Old Index