Module Name: src
Committed By: matt
Date: Mon Jun 20 07:18:07 UTC 2011
Modified Files:
src/sys/arch/bebox/bebox: machdep.c
src/sys/arch/evbppc/ev64260: machdep.c
src/sys/arch/evbppc/pmppc: machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
src/sys/arch/ibmnws/ibmnws: machdep.c
src/sys/arch/macppc/macppc: machdep.c
src/sys/arch/mvmeppc/mvmeppc: machdep.c
src/sys/arch/powerpc/oea: oea_machdep.c
src/sys/arch/prep/prep: machdep.c platform.c
src/sys/arch/rs6000/rs6000: machdep.c
src/sys/arch/sandpoint/sandpoint: machdep.c
Log Message:
Cleanup includes. (<net/netisr.h> is handled by softints, not MD anymore,
so this can be nuked).
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/bebox/bebox/machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbppc/ev64260/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/pmppc/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ibmnws/ibmnws/machdep.c
cvs rdiff -u -r1.157 -r1.158 src/sys/arch/macppc/macppc/machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/prep/prep/machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/prep/prep/platform.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/rs6000/rs6000/machdep.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sandpoint/sandpoint/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/bebox/bebox/machdep.c
diff -u src/sys/arch/bebox/bebox/machdep.c:1.99 src/sys/arch/bebox/bebox/machdep.c:1.100
--- src/sys/arch/bebox/bebox/machdep.c:1.99 Sat Oct 30 06:11:18 2010
+++ src/sys/arch/bebox/bebox/machdep.c Mon Jun 20 07:18:05 2011
@@ -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>
Index: src/sys/arch/evbppc/ev64260/machdep.c
diff -u src/sys/arch/evbppc/ev64260/machdep.c:1.28 src/sys/arch/evbppc/ev64260/machdep.c:1.29
--- src/sys/arch/evbppc/ev64260/machdep.c:1.28 Mon Dec 20 00:25:32 2010
+++ src/sys/arch/evbppc/ev64260/machdep.c Mon Jun 20 07:18:06 2011
@@ -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,12 +62,11 @@
#include <uvm/uvm_extern.h>
-#include <net/netisr.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>
#include <powerpc/pio.h>
Index: src/sys/arch/evbppc/pmppc/machdep.c
diff -u src/sys/arch/evbppc/pmppc/machdep.c:1.10 src/sys/arch/evbppc/pmppc/machdep.c:1.11
--- src/sys/arch/evbppc/pmppc/machdep.c:1.10 Mon Dec 20 00:25:32 2010
+++ src/sys/arch/evbppc/pmppc/machdep.c Mon Jun 20 07:18:06 2011
@@ -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/syslog.h>
#include <sys/sysctl.h>
+#include <sys/syslog.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>
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.18 src/sys/arch/evbppc/virtex/machdep.c:1.19
--- src/sys/arch/evbppc/virtex/machdep.c:1.18 Sat Jun 18 06:44:27 2011
+++ src/sys/arch/evbppc/virtex/machdep.c Mon Jun 20 07:18:06 2011
@@ -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
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.51 src/sys/arch/evbppc/walnut/machdep.c:1.52
--- src/sys/arch/evbppc/walnut/machdep.c:1.51 Sat Jun 18 06:44:28 2011
+++ src/sys/arch/evbppc/walnut/machdep.c Mon Jun 20 07:18:06 2011
@@ -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>
+#include <powerpc/db_machdep.h>
#include <ddb/db_extern.h>
#endif
Index: src/sys/arch/ibmnws/ibmnws/machdep.c
diff -u src/sys/arch/ibmnws/ibmnws/machdep.c:1.14 src/sys/arch/ibmnws/ibmnws/machdep.c:1.15
--- src/sys/arch/ibmnws/ibmnws/machdep.c:1.14 Fri Nov 27 03:23:10 2009
+++ src/sys/arch/ibmnws/ibmnws/machdep.c Mon Jun 20 07:18:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2009/11/27 03:23:10 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2011/06/20 07:18:06 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,16 +32,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2009/11/27 03:23:10 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/06/20 07:18:06 matt Exp $");
#include "opt_compat_netbsd.h"
#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/malloc.h>
#include <sys/mbuf.h>
@@ -50,25 +52,22 @@
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/syscallargs.h>
+#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-
-#include <net/netisr.h>
-
#include <machine/autoconf.h>
-#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/trap.h>
#include <powerpc/oea/bat.h>
-#include <arch/powerpc/pic/picvar.h>
-#include <arch/powerpc/include/pio.h>
+#include <powerpc/pic/picvar.h>
+#include <powerpc/include/pio.h>
+
#include <dev/pci/pcivar.h>
#include <dev/ic/ibm82660reg.h>
Index: src/sys/arch/macppc/macppc/machdep.c
diff -u src/sys/arch/macppc/macppc/machdep.c:1.157 src/sys/arch/macppc/macppc/machdep.c:1.158
--- src/sys/arch/macppc/macppc/machdep.c:1.157 Sat Jun 18 08:08:28 2011
+++ src/sys/arch/macppc/macppc/machdep.c Mon Jun 20 07:18:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.157 2011/06/18 08:08:28 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.158 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.157 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.158 2011/06/20 07:18:06 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -45,7 +45,13 @@
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/boot_flag.h>
+#include <sys/bus.h>
+#include <sys/conf.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/mount.h>
@@ -55,16 +61,9 @@
#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/conf.h>
-#include <sys/device.h>
-
-#include <net/netisr.h>
#ifdef DDB
-#include <machine/db_machdep.h>
+#include <powerpc/db_machdep.h>
#include <ddb/db_extern.h>
#endif
@@ -81,9 +80,9 @@
#include <machine/autoconf.h>
#include <machine/powerpc.h>
-#include <machine/trap.h>
-#include <machine/bus.h>
-#include <machine/fpu.h>
+
+#include <powerpc/trap.h>
+#include <powerpc/fpu.h>
#include <powerpc/oea/bat.h>
#include <powerpc/spr.h>
#ifdef ALTIVEC
@@ -91,7 +90,11 @@
#endif
#include <powerpc/ofw_cons.h>
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
+#ifdef MULTIPROCESSOR
+#include <powerpc/pic/ipivar.h>
+#endif
+
#include <macppc/dev/adbvar.h>
#include <macppc/dev/pmuvar.h>
#include <macppc/dev/cudavar.h>
@@ -100,10 +103,6 @@
#include "pmu.h"
#include "cuda.h"
-#ifdef MULTIPROCESSOR
-#include <arch/powerpc/pic/ipivar.h>
-#endif
-
struct genfb_colormap_callback gfb_cb;
struct genfb_parameter_callback gpc;
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.27 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.28
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.27 Mon Dec 20 00:25:39 2010
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.27 2010/12/20 00:25:39 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.28 2011/06/20 07:18:07 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2010/12/20 00:25:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.28 2011/06/20 07:18:07 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -40,10 +40,12 @@
#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/malloc.h>
#include <sys/mbuf.h>
@@ -54,19 +56,15 @@
#include <sys/syscallargs.h>
#include <sys/syslog.h>
#include <sys/systm.h>
-
#include <sys/sysctl.h>
-#include <net/netisr.h>
-
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/pmap.h>
#include <machine/platform.h>
#include <machine/powerpc.h>
-#include <machine/trap.h>
+
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
#include <powerpc/oea/bat.h>
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.57 src/sys/arch/powerpc/oea/oea_machdep.c:1.58
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.57 Sat Jun 18 20:34:39 2011
+++ src/sys/arch/powerpc/oea/oea_machdep.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.57 2011/06/18 20:34:39 matt Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.58 2011/06/20 07:18:07 matt Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.57 2011/06/18 20:34:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.58 2011/06/20 07:18:07 matt Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -45,7 +45,9 @@
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/boot_flag.h>
#include <sys/exec.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mount.h>
@@ -55,15 +57,11 @@
#include <sys/syscallargs.h>
#include <sys/syslog.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/boot_flag.h>
#include <uvm/uvm_extern.h>
-#include <net/netisr.h>
-
#ifdef DDB
-#include <machine/db_machdep.h>
+#include <powerpc/db_machdep.h>
#include <ddb/db_extern.h>
#endif
@@ -75,13 +73,14 @@
#include <ipkdb/ipkdb.h>
#endif
+#include <machine/powerpc.h>
+
#include <powerpc/trap.h>
#include <powerpc/stdarg.h>
#include <powerpc/spr.h>
#include <powerpc/pte.h>
#include <powerpc/altivec.h>
#include <powerpc/pcb.h>
-#include <machine/powerpc.h>
#include <powerpc/oea/spr.h>
#include <powerpc/oea/bat.h>
Index: src/sys/arch/prep/prep/machdep.c
diff -u src/sys/arch/prep/prep/machdep.c:1.71 src/sys/arch/prep/prep/machdep.c:1.72
--- src/sys/arch/prep/prep/machdep.c:1.71 Sat Aug 7 06:16:22 2010
+++ src/sys/arch/prep/prep/machdep.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.71 2010/08/07 06:16:22 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.72 2011/06/20 07:18:07 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,17 +32,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/08/07 06:16:22 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.72 2011/06/20 07:18:07 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_openpic.h"
#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/malloc.h>
#include <sys/mbuf.h>
@@ -53,28 +55,24 @@
#include <sys/syscallargs.h>
#include <sys/syslog.h>
#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-
#include <sys/sysctl.h>
-#include <net/netisr.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/pmap.h>
#include <machine/platform.h>
#include <machine/powerpc.h>
#include <machine/residual.h>
-#include <machine/trap.h>
+
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
#include <powerpc/oea/bat.h>
#include <powerpc/openpic.h>
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
#ifdef MULTIPROCESSOR
-#include <arch/powerpc/pic/ipivar.h>
+#include <powerpc/pic/ipivar.h>
#endif
#include <dev/cons.h>
Index: src/sys/arch/prep/prep/platform.c
diff -u src/sys/arch/prep/prep/platform.c:1.25 src/sys/arch/prep/prep/platform.c:1.26
--- src/sys/arch/prep/prep/platform.c:1.25 Sat Jun 18 08:08:30 2011
+++ src/sys/arch/prep/prep/platform.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.c,v 1.25 2011/06/18 08:08:30 matt Exp $ */
+/* $NetBSD: platform.c,v 1.26 2011/06/20 07:18:07 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,21 +30,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.25 2011/06/18 08:08:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: platform.c,v 1.26 2011/06/20 07:18:07 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
+#include <sys/intr.h>
#include <sys/inttypes.h>
+#include <powerpc/pio.h>
+#include <powerpc/psl.h>
+
#include <dev/pci/pcivar.h>
-#include <machine/intr.h>
#include <machine/platform.h>
-#include <machine/residual.h>
-#include <powerpc/pio.h>
-
#include <machine/pcipnp.h>
+#include <machine/residual.h>
u_int32_t prep_pci_baseaddr = 0x80000cf8;
u_int32_t prep_pci_basedata = 0x80000cfc;
Index: src/sys/arch/rs6000/rs6000/machdep.c
diff -u src/sys/arch/rs6000/rs6000/machdep.c:1.9 src/sys/arch/rs6000/rs6000/machdep.c:1.10
--- src/sys/arch/rs6000/rs6000/machdep.c:1.9 Wed Jun 15 05:50:49 2011
+++ src/sys/arch/rs6000/rs6000/machdep.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.9 2011/06/15 05:50:49 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.10 2011/06/20 07:18:07 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2011/06/15 05:50:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2011/06/20 07:18:07 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -38,11 +38,14 @@
#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>
@@ -50,29 +53,23 @@
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/syscallargs.h>
+#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/systm.h>
-#include <sys/ksyms.h>
#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-
-#include <net/netisr.h>
-
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/pmap.h>
#include <machine/powerpc.h>
-#include <machine/trap.h>
-
#include <machine/iplcb.h>
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
+
#include <powerpc/oea/bat.h>
#include <powerpc/pio.h>
-#include <arch/powerpc/pic/picvar.h>
+#include <powerpc/pic/picvar.h>
#include <dev/cons.h>
@@ -85,7 +82,7 @@
#endif
#ifdef DDB
-#include <machine/db_machdep.h>
+#include <powerpc/db_machdep.h>
#include <ddb/db_extern.h>
#endif
Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.56 src/sys/arch/sandpoint/sandpoint/machdep.c:1.57
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.56 Tue Apr 19 18:06:19 2011
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Mon Jun 20 07:18:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.56 2011/04/19 18:06:19 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.57 2011/06/20 07:18:07 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2011/04/19 18:06:19 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2011/06/20 07:18:07 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -42,41 +42,40 @@
#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/module.h>
#include <sys/mount.h>
#include <sys/msgbuf.h>
#include <sys/proc.h>
#include <sys/reboot.h>
#include <sys/syscallargs.h>
-#include <sys/syslog.h>
#include <sys/sysctl.h>
+#include <sys/syslog.h>
#include <sys/systm.h>
-#include <sys/ksyms.h>
-#include <sys/module.h>
#include <uvm/uvm_extern.h>
-#include <net/netisr.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/pmap.h>
#include <machine/powerpc.h>
-#include <machine/trap.h>
#include <machine/bootinfo.h>
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
+
#include <powerpc/oea/bat.h>
#include <powerpc/openpic.h>
#include <powerpc/pic/picvar.h>
#ifdef DDB
-#include <machine/db_machdep.h>
+#include <powerpc/db_machdep.h>
#include <ddb/db_extern.h>
#endif
