Module Name: src
Committed By: matt
Date: Sun Jul 10 00:03:53 UTC 2011
Modified Files:
src/sys/arch/evbmips/adm5120: machdep.c
src/sys/arch/evbmips/alchemy: dbau1500.c dbau1550.c genericbd.c
mach_intr.c machdep.c mtx-1.c omsal400.c
src/sys/arch/evbmips/atheros: mach_intr.c machdep.c wdog.c
src/sys/arch/evbmips/evbmips: interrupt.c
src/sys/arch/evbmips/gdium: gdium_bus_io.c gdium_bus_mem.c gdium_dma.c
gdium_genfb.c gdium_intr.c machdep.c
src/sys/arch/evbmips/isa: isadma_bounce.c
src/sys/arch/evbmips/malta: machdep.c
Log Message:
CLeanup machine includes
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/alchemy/dbau1500.c \
src/sys/arch/evbmips/alchemy/mtx-1.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/alchemy/dbau1550.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/alchemy/genericbd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/alchemy/mach_intr.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/alchemy/omsal400.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/atheros/mach_intr.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/atheros/wdog.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/gdium/gdium_bus_io.c \
src/sys/arch/evbmips/gdium/gdium_bus_mem.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/gdium/gdium_dma.c \
src/sys/arch/evbmips/gdium/gdium_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/gdium/gdium_genfb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/gdium/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/isa/isadma_bounce.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbmips/malta/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/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.20 src/sys/arch/evbmips/adm5120/machdep.c:1.21
--- src/sys/arch/evbmips/adm5120/machdep.c:1.20 Sun Feb 20 07:48:33 2011
+++ src/sys/arch/evbmips/adm5120/machdep.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -83,16 +83,16 @@
#include "pci.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/boot_flag.h>
#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
+#include <sys/device.h>
#include <sys/kcore.h>
-#include <sys/boot_flag.h>
-#include <sys/termios.h>
+#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -104,7 +104,7 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#endif
Index: src/sys/arch/evbmips/alchemy/dbau1500.c
diff -u src/sys/arch/evbmips/alchemy/dbau1500.c:1.6 src/sys/arch/evbmips/alchemy/dbau1500.c:1.7
--- src/sys/arch/evbmips/alchemy/dbau1500.c:1.6 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/dbau1500.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
#include <evbmips/alchemy/dbau1500reg.h>
Index: src/sys/arch/evbmips/alchemy/mtx-1.c
diff -u src/sys/arch/evbmips/alchemy/mtx-1.c:1.6 src/sys/arch/evbmips/alchemy/mtx-1.c:1.7
--- src/sys/arch/evbmips/alchemy/mtx-1.c:1.6 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/mtx-1.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: mtx-1.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.7 2011/07/10 00:03:52 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
Index: src/sys/arch/evbmips/alchemy/dbau1550.c
diff -u src/sys/arch/evbmips/alchemy/dbau1550.c:1.11 src/sys/arch/evbmips/alchemy/dbau1550.c:1.12
--- src/sys/arch/evbmips/alchemy/dbau1550.c:1.11 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/dbau1550.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,19 +32,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.11 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v 1.12 2011/07/10 00:03:52 matt Exp $");
#include <sys/param.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
-#include <sys/time.h>
#include <sys/proc.h>
-#include <sys/bus.h>
-#include <machine/locore.h>
+#include <sys/time.h>
+
+#include <mips/locore.h>
+
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/dev/aupcmciavar.h>
#include <mips/alchemy/dev/aupcmciareg.h>
#include <mips/alchemy/dev/augpioreg.h>
#include <mips/alchemy/dev/auspivar.h>
+
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
#include <evbmips/alchemy/dbau1550reg.h>
Index: src/sys/arch/evbmips/alchemy/genericbd.c
diff -u src/sys/arch/evbmips/alchemy/genericbd.c:1.3 src/sys/arch/evbmips/alchemy/genericbd.c:1.4
--- src/sys/arch/evbmips/alchemy/genericbd.c:1.3 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/genericbd.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: genericbd.c,v 1.4 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,11 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.3 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.4 2011/07/10 00:03:52 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
Index: src/sys/arch/evbmips/alchemy/mach_intr.c
diff -u src/sys/arch/evbmips/alchemy/mach_intr.c:1.5 src/sys/arch/evbmips/alchemy/mach_intr.c:1.6
--- src/sys/arch/evbmips/alchemy/mach_intr.c:1.5 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/mach_intr.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,19 +38,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:52 matt Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <mips/locore.h>
#include <mips/alchemy/include/auvar.h>
Index: src/sys/arch/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.50 src/sys/arch/evbmips/alchemy/machdep.c:1.51
--- src/sys/arch/evbmips/alchemy/machdep.c:1.50 Mon Apr 4 20:37:49 2011
+++ src/sys/arch/evbmips/alchemy/machdep.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $ */
+/* $NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2011/04/04 20:37:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2011/07/10 00:03:52 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -80,16 +80,16 @@
#include "opt_ethaddr.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/boot_flag.h>
#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
+#include <sys/device.h>
#include <sys/kcore.h>
-#include <sys/boot_flag.h>
-#include <sys/termios.h>
+#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
#include <net/if.h>
#include <net/if_ether.h>
@@ -101,15 +101,17 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#endif
#include <mips/cache.h>
#include <mips/locore.h>
+
#include <machine/yamon.h>
#include <evbmips/alchemy/board.h>
+
#include <mips/alchemy/dev/aupcivar.h>
#include <mips/alchemy/dev/aupcmciavar.h>
#include <mips/alchemy/dev/auspivar.h>
Index: src/sys/arch/evbmips/alchemy/omsal400.c
diff -u src/sys/arch/evbmips/alchemy/omsal400.c:1.8 src/sys/arch/evbmips/alchemy/omsal400.c:1.9
--- src/sys/arch/evbmips/alchemy/omsal400.c:1.8 Fri Jul 1 18:44:45 2011
+++ src/sys/arch/evbmips/alchemy/omsal400.c Sun Jul 10 00:03:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $ */
+/* $NetBSD: omsal400.c,v 1.9 2011/07/10 00:03:52 matt Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -36,13 +36,16 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.8 2011/07/01 18:44:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.9 2011/07/10 00:03:52 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
-#include <machine/locore.h>
+
+#include <mips/locore.h>
+
#include <mips/alchemy/dev/augpiovar.h>
#include <mips/alchemy/dev/aupcmciavar.h>
+
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
#include <evbmips/alchemy/omsal400reg.h>
Index: src/sys/arch/evbmips/atheros/mach_intr.c
diff -u src/sys/arch/evbmips/atheros/mach_intr.c:1.5 src/sys/arch/evbmips/atheros/mach_intr.c:1.6
--- src/sys/arch/evbmips/atheros/mach_intr.c:1.5 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/evbmips/atheros/mach_intr.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_intr.c,v 1.5 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,18 +34,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.5 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.6 2011/07/10 00:03:53 matt Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/systm.h>
#include <mips/locore.h>
#include <mips/atheros/include/platform.h>
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.26 src/sys/arch/evbmips/atheros/machdep.c:1.27
--- src/sys/arch/evbmips/atheros/machdep.c:1.26 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/evbmips/atheros/machdep.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.26 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -110,23 +110,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2011/07/10 00:03:53 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_modular.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/boot_flag.h>
+#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
#include <sys/kcore.h>
-#include <sys/boot_flag.h>
-#include <sys/termios.h>
#include <sys/ksyms.h>
-#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
#include <uvm/uvm_extern.h>
@@ -135,7 +132,7 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#endif
Index: src/sys/arch/evbmips/atheros/wdog.c
diff -u src/sys/arch/evbmips/atheros/wdog.c:1.6 src/sys/arch/evbmips/atheros/wdog.c:1.7
--- src/sys/arch/evbmips/atheros/wdog.c:1.6 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/evbmips/atheros/wdog.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdog.c,v 1.6 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: wdog.c,v 1.7 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -79,15 +79,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.6 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdog.c,v 1.7 2011/07/10 00:03:53 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/wdog.h>
-#include <machine/cpu.h>
-
#include <mips/atheros/include/platform.h>
#include <dev/sysmon/sysmonvar.h>
Index: src/sys/arch/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.16 src/sys/arch/evbmips/evbmips/interrupt.c:1.17
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.16 Thu Jul 7 05:06:44 2011
+++ src/sys/arch/evbmips/evbmips/interrupt.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.16 2011/07/07 05:06:44 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.16 2011/07/07 05:06:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/intr.h>
+#include <mips/locore.h>
#include <mips/mips3_clock.h>
-#include <machine/locore.h>
void
intr_init(void)
Index: src/sys/arch/evbmips/gdium/gdium_bus_io.c
diff -u src/sys/arch/evbmips/gdium/gdium_bus_io.c:1.1 src/sys/arch/evbmips/gdium/gdium_bus_io.c:1.2
--- src/sys/arch/evbmips/gdium/gdium_bus_io.c:1.1 Thu Aug 6 00:50:26 2009
+++ src/sys/arch/evbmips/gdium/gdium_bus_io.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_bus_io.c,v 1.1 2009/08/06 00:50:26 matt Exp $ */
+/* $NetBSD: gdium_bus_io.c,v 1.2 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,17 +34,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_bus_io.c,v 1.1 2009/08/06 00:50:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_bus_io.c,v 1.2 2011/07/10 00:03:53 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <sys/device.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/bonito/bonitoreg.h>
Index: src/sys/arch/evbmips/gdium/gdium_bus_mem.c
diff -u src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.1 src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.2
--- src/sys/arch/evbmips/gdium/gdium_bus_mem.c:1.1 Thu Aug 6 00:50:26 2009
+++ src/sys/arch/evbmips/gdium/gdium_bus_mem.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_bus_mem.c,v 1.1 2009/08/06 00:50:26 matt Exp $ */
+/* $NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,17 +34,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.1 2009/08/06 00:50:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_bus_mem.c,v 1.2 2011/07/10 00:03:53 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <sys/device.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <mips/bonito/bonitoreg.h>
Index: src/sys/arch/evbmips/gdium/gdium_dma.c
diff -u src/sys/arch/evbmips/gdium/gdium_dma.c:1.4 src/sys/arch/evbmips/gdium/gdium_dma.c:1.5
--- src/sys/arch/evbmips/gdium/gdium_dma.c:1.4 Fri Jul 1 18:45:36 2011
+++ src/sys/arch/evbmips/gdium/gdium_dma.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $ */
+/* $NetBSD: gdium_dma.c,v 1.5 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,11 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
-
-#include <sys/param.h>
+__KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,v 1.5 2011/07/10 00:03:53 matt Exp $");
#define _MIPS_BUS_DMA_PRIVATE
+
+#include <sys/param.h>
#include <sys/bus.h>
#include <evbmips/gdium/gdiumreg.h>
Index: src/sys/arch/evbmips/gdium/gdium_intr.c
diff -u src/sys/arch/evbmips/gdium/gdium_intr.c:1.4 src/sys/arch/evbmips/gdium/gdium_intr.c:1.5
--- src/sys/arch/evbmips/gdium/gdium_intr.c:1.4 Fri Jul 1 18:45:36 2011
+++ src/sys/arch/evbmips/gdium/gdium_intr.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $ */
+/* $NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.4 2011/07/01 18:45:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_intr.c,v 1.5 2011/07/10 00:03:53 matt Exp $");
#define __INTR_PRIVATE
@@ -45,15 +45,13 @@
#include "opt_ddb.h"
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/cpu.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
#include <mips/locore.h>
Index: src/sys/arch/evbmips/gdium/gdium_genfb.c
diff -u src/sys/arch/evbmips/gdium/gdium_genfb.c:1.5 src/sys/arch/evbmips/gdium/gdium_genfb.c:1.6
--- src/sys/arch/evbmips/gdium/gdium_genfb.c:1.5 Fri Jul 1 18:45:36 2011
+++ src/sys/arch/evbmips/gdium/gdium_genfb.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $ */
+/* $NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,10 +28,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.5 2011/07/01 18:45:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdium_genfb.c,v 1.6 2011/07/10 00:03:53 matt Exp $");
#include <sys/param.h>
#include <sys/buf.h>
+#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
@@ -39,8 +40,6 @@
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <sys/bus.h>
-
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
Index: src/sys/arch/evbmips/gdium/machdep.c
diff -u src/sys/arch/evbmips/gdium/machdep.c:1.14 src/sys/arch/evbmips/gdium/machdep.c:1.15
--- src/sys/arch/evbmips/gdium/machdep.c:1.14 Wed Jun 8 17:47:48 2011
+++ src/sys/arch/evbmips/gdium/machdep.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2011/06/08 17:47:48 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2011/07/10 00:03:53 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,23 +74,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2011/06/08 17:47:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/07/10 00:03:53 matt Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_modular.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/boot_flag.h>
#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kcore.h>
-#include <sys/boot_flag.h>
-#include <sys/termios.h>
+#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
#include <uvm/uvm_extern.h>
@@ -99,14 +100,12 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#endif
-#include <machine/cpu.h>
-#include <machine/psl.h>
-
#include <mips/locore.h>
+#include <mips/psl.h>
#include <mips/bonito/bonitoreg.h>
#include <evbmips/gdium/gdiumvar.h>
Index: src/sys/arch/evbmips/isa/isadma_bounce.c
diff -u src/sys/arch/evbmips/isa/isadma_bounce.c:1.10 src/sys/arch/evbmips/isa/isadma_bounce.c:1.11
--- src/sys/arch/evbmips/isa/isadma_bounce.c:1.10 Fri Jul 8 18:50:11 2011
+++ src/sys/arch/evbmips/isa/isadma_bounce.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -31,20 +31,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.10 2011/07/08 18:50:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.11 2011/07/10 00:03:53 matt Exp $");
+
+#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/syslog.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
#include <mips/cache.h>
-#define _MIPS_BUS_DMA_PRIVATE
-#include <sys/bus.h>
-#include <machine/locore.h>
+#include <mips/locore.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: src/sys/arch/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.40 src/sys/arch/evbmips/malta/machdep.c:1.41
--- src/sys/arch/evbmips/malta/machdep.c:1.40 Sun Feb 20 07:48:34 2011
+++ src/sys/arch/evbmips/malta/machdep.c Sun Jul 10 00:03:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.40 2011/02/20 07:48:34 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,23 +74,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2011/02/20 07:48:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2011/07/10 00:03:53 matt Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
#include "opt_modular.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/boot_flag.h>
#include <sys/buf.h>
-#include <sys/reboot.h>
-#include <sys/mount.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kcore.h>
-#include <sys/boot_flag.h>
-#include <sys/termios.h>
+#include <sys/kernel.h>
#include <sys/ksyms.h>
-#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/termios.h>
#include <uvm/uvm_extern.h>
@@ -99,15 +100,14 @@
#include "ksyms.h"
#if NKSYMS || defined(DDB) || defined(MODULAR)
-#include <machine/db_machdep.h>
+#include <mips/db_machdep.h>
#include <ddb/db_extern.h>
#endif
-#include <machine/cpu.h>
-#include <machine/psl.h>
#include <machine/yamon.h>
#include <mips/locore.h>
+#include <mips/psl.h>
#include <evbmips/malta/autoconf.h>
#include <evbmips/malta/maltareg.h>
