[src/trunk]: src/sys/arch/evbmips CLeanup machine includes

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

details:   https://anonhg.NetBSD.org/src/rev/ba581696e95e
branches:  trunk
changeset: 767155:ba581696e95e
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jul 10 00:03:52 2011 +0000

description:
CLeanup machine includes

diffstat:

 sys/arch/evbmips/adm5120/machdep.c     |  20 ++++++++++----------
 sys/arch/evbmips/alchemy/dbau1500.c    |   8 +++++---
 sys/arch/evbmips/alchemy/dbau1550.c    |  13 ++++++++-----
 sys/arch/evbmips/alchemy/genericbd.c   |   8 +++++---
 sys/arch/evbmips/alchemy/mach_intr.c   |  14 ++++++--------
 sys/arch/evbmips/alchemy/machdep.c     |  22 ++++++++++++----------
 sys/arch/evbmips/alchemy/mtx-1.c       |   8 +++++---
 sys/arch/evbmips/alchemy/omsal400.c    |   9 ++++++---
 sys/arch/evbmips/atheros/mach_intr.c   |  12 +++++-------
 sys/arch/evbmips/atheros/machdep.c     |  19 ++++++++-----------
 sys/arch/evbmips/atheros/wdog.c        |   8 +++-----
 sys/arch/evbmips/evbmips/interrupt.c   |   8 ++++----
 sys/arch/evbmips/gdium/gdium_bus_io.c  |  10 +++++-----
 sys/arch/evbmips/gdium/gdium_bus_mem.c |  10 +++++-----
 sys/arch/evbmips/gdium/gdium_dma.c     |   8 ++++----
 sys/arch/evbmips/gdium/gdium_genfb.c   |   7 +++----
 sys/arch/evbmips/gdium/gdium_intr.c    |  16 +++++++---------
 sys/arch/evbmips/gdium/machdep.c       |  25 ++++++++++++-------------
 sys/arch/evbmips/isa/isadma_bounce.c   |  16 ++++++++--------
 sys/arch/evbmips/malta/machdep.c       |  24 ++++++++++++------------
 20 files changed, 133 insertions(+), 132 deletions(-)

diffs (truncated from 732 to 300 lines):

diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/adm5120/machdep.c
--- a/sys/arch/evbmips/adm5120/machdep.c        Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/adm5120/machdep.c        Sun Jul 10 00:03:52 2011 +0000
@@ -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/boot_flag.h>
+#include <sys/buf.h>
+#include <sys/device.h>
+#include <sys/kcore.h>
 #include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
+#include <sys/ksyms.h>
 #include <sys/mount.h>
-#include <sys/kcore.h>
-#include <sys/boot_flag.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
 #include <sys/termios.h>
-#include <sys/ksyms.h>
-#include <sys/device.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
 
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/dbau1500.c
--- a/sys/arch/evbmips/alchemy/dbau1500.c       Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1500.c       Sun Jul 10 00:03:52 2011 +0000
@@ -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>
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/dbau1550.c
--- a/sys/arch/evbmips/alchemy/dbau1550.c       Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/dbau1550.c       Sun Jul 10 00:03:52 2011 +0000
@@ -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>
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/genericbd.c
--- a/sys/arch/evbmips/alchemy/genericbd.c      Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/genericbd.c      Sun Jul 10 00:03:52 2011 +0000
@@ -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>
 
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/mach_intr.c
--- a/sys/arch/evbmips/alchemy/mach_intr.c      Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/mach_intr.c      Sun Jul 10 00:03:52 2011 +0000
@@ -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/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-
-#include <sys/bus.h>
-#include <machine/intr.h>
 
 #include <mips/locore.h>
 #include <mips/alchemy/include/auvar.h>
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/machdep.c
--- a/sys/arch/evbmips/alchemy/machdep.c        Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/machdep.c        Sun Jul 10 00:03:52 2011 +0000
@@ -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/boot_flag.h>
+#include <sys/buf.h>
+#include <sys/device.h>
+#include <sys/kcore.h>
 #include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/reboot.h>
+#include <sys/ksyms.h>
 #include <sys/mount.h>
-#include <sys/kcore.h>
-#include <sys/boot_flag.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
 #include <sys/termios.h>
-#include <sys/ksyms.h>
-#include <sys/device.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>
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/mtx-1.c
--- a/sys/arch/evbmips/alchemy/mtx-1.c  Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/mtx-1.c  Sun Jul 10 00:03:52 2011 +0000
@@ -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>
 
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/alchemy/omsal400.c
--- a/sys/arch/evbmips/alchemy/omsal400.c       Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/alchemy/omsal400.c       Sun Jul 10 00:03:52 2011 +0000
@@ -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>
diff -r dd5ea049d573 -r ba581696e95e sys/arch/evbmips/atheros/mach_intr.c
--- a/sys/arch/evbmips/atheros/mach_intr.c      Sun Jul 10 00:03:12 2011 +0000
+++ b/sys/arch/evbmips/atheros/mach_intr.c      Sun Jul 10 00:03:52 2011 +0000
@@ -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 $");