[src/trunk]: src/sys/arch/vax Cleanup includes. Change <machine/XXX.h> to <s...

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

details:   https://anonhg.NetBSD.org/src/rev/1fa4248e66c7
branches:  trunk
changeset: 759688:1fa4248e66c7
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Dec 14 23:38:30 2010 +0000

description:
Cleanup includes.  Change <machine/XXX.h> to <sys/XXX.h> for bus, cpu, intr.
Remove unneeded includes.

diffstat:

 sys/arch/vax/bi/bi_mainbus.c   |  11 ++++++-----
 sys/arch/vax/bi/bi_nmi.c       |  13 +++++++------
 sys/arch/vax/if/if_le.c        |   9 ++++-----
 sys/arch/vax/if/if_le_vsbus.c  |  12 +++++-------
 sys/arch/vax/if/if_ze.c        |  12 +++++-------
 sys/arch/vax/mba/hp.c          |  15 +++++----------
 sys/arch/vax/mba/mba.c         |  12 +++++-------
 sys/arch/vax/uba/uba_cmi.c     |  14 +++++++-------
 sys/arch/vax/uba/uba_dma.c     |  14 ++++++++------
 sys/arch/vax/uba/uba_mainbus.c |  14 +++++++-------
 sys/arch/vax/uba/uba_sbi.c     |  14 +++++++-------
 sys/arch/vax/uba/uba_ubi.c     |  14 +++++++-------
 12 files changed, 73 insertions(+), 81 deletions(-)

diffs (truncated from 429 to 300 lines):

diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/bi/bi_mainbus.c
--- a/sys/arch/vax/bi/bi_mainbus.c      Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/bi/bi_mainbus.c      Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $        */
+/*     $NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $        */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,17 +31,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.10 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_mainbus.c,v 1.11 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
 #include <sys/device.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 
-#define        _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
 #include <machine/nexus.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
-#include <machine/cpu.h>
 #include <machine/mainbus.h>
 
 #include <dev/bi/bivar.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/bi/bi_nmi.c
--- a/sys/arch/vax/bi/bi_nmi.c  Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/bi/bi_nmi.c  Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $     */
+/*     $NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $     */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,18 +31,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.7 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_nmi.c,v 1.8 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/systm.h>
 
-#define        _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
 #include <machine/nexus.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
-#include <machine/cpu.h>
 #include <machine/ka88.h>
 
 #include <dev/bi/bivar.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/if/if_le.c
--- a/sys/arch/vax/if/if_le.c   Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/if/if_le.c   Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $ */
+/*     $NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,15 +65,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.36 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.37 2010/12/14 23:38:30 matt Exp $");
 
 #include "opt_inet.h"
 
 #include <sys/param.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
-#include <sys/device.h>
-#include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -86,7 +86,6 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <machine/cpu.h>
 #include <machine/nexus.h>
 #include <machine/scb.h>
 #include <machine/mainbus.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/if/if_le_vsbus.c
--- a/sys/arch/vax/if/if_le_vsbus.c     Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/if/if_le_vsbus.c     Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $   */
+/*     $NetBSD: if_le_vsbus.c,v 1.28 2010/12/14 23:38:30 matt Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,15 +64,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_vsbus.c,v 1.27 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_vsbus.c,v 1.28 2010/12/14 23:38:30 matt Exp $");
 
 #include "opt_inet.h"
 
 #include <sys/param.h>
-#include <sys/syslog.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
 #include <sys/socket.h>
-#include <sys/device.h>
-#include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -85,10 +85,8 @@
 #include <netinet/if_inarp.h>
 #endif
 
-#include <machine/cpu.h>
 #include <machine/sid.h>
 #include <machine/scb.h>
-#include <machine/bus.h>
 #include <machine/vsbus.h>
 
 #include <dev/ic/lancereg.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/if/if_ze.c
--- a/sys/arch/vax/if/if_ze.c   Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/if/if_ze.c   Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_ze.c,v 1.16 2010/01/19 22:06:23 pooka Exp $ */
+/*      $NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -30,15 +30,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.16 2010/01/19 22:06:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ze.c,v 1.17 2010/12/14 23:38:30 matt Exp $");
 
 #include "opt_cputype.h"
 
 #include <sys/param.h>
-#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/systm.h>
-#include <sys/sockio.h>
 
 #include <net/if.h>
 #include <net/if_ether.h>
@@ -47,9 +47,7 @@
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 
-#include <machine/bus.h>
 #include <machine/nexus.h>
-#include <machine/cpu.h>
 #include <machine/scb.h>
 #include <machine/sid.h>
 #include <machine/mainbus.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/mba/hp.c
--- a/sys/arch/vax/mba/hp.c     Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/mba/hp.c     Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hp.c,v 1.47 2009/01/13 13:35:52 yamt Exp $ */
+/*     $NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -42,10 +42,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.47 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hp.c,v 1.48 2010/12/14 23:38:30 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
@@ -55,16 +57,9 @@
 #include <sys/stat.h>
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
-#include <sys/syslog.h>
-#include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/event.h>
-
-#include <machine/bus.h>
-#include <machine/trap.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
+#include <sys/syslog.h>
 
 #include <vax/mba/mbavar.h>
 #include <vax/mba/mbareg.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/mba/mba.c
--- a/sys/arch/vax/mba/mba.c    Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/mba/mba.c    Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mba.c,v 1.38 2009/01/13 13:35:52 yamt Exp $ */
+/*     $NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $ */
 /*
  * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -38,25 +38,23 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.38 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mba.c,v 1.39 2010/12/14 23:38:30 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm_extern.h>
-
-#include <machine/bus.h>
 #include <machine/scb.h>
 #include <machine/nexus.h>
 #include <machine/pte.h>
-#include <machine/pcb.h>
 #include <machine/sid.h>
-#include <machine/cpu.h>
+#include <machine/sid.h>
 
 #include <vax/mba/mbareg.h>
 #include <vax/mba/mbavar.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/uba/uba_cmi.c
--- a/sys/arch/vax/uba/uba_cmi.c        Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/uba/uba_cmi.c        Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uba_cmi.c,v 1.14 2008/03/11 05:34:02 matt Exp $           */
+/*     $NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $           */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -68,17 +68,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.14 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_cmi.c,v 1.15 2010/12/14 23:38:30 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
-#include <sys/systm.h>
+#include <sys/bus.h>
 
-#define        _VAX_BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/mtpr.h>
 #include <machine/nexus.h>
-#include <machine/cpu.h>
 #include <machine/sgmap.h>
 
 #include <dev/qbus/ubavar.h>
diff -r 9b057c9e2c26 -r 1fa4248e66c7 sys/arch/vax/uba/uba_dma.c
--- a/sys/arch/vax/uba/uba_dma.c        Tue Dec 14 23:31:16 2010 +0000
+++ b/sys/arch/vax/uba/uba_dma.c        Tue Dec 14 23:38:30 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_dma.c,v 1.10 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: uba_dma.c,v 1.11 2010/12/14 23:38:30 matt Exp $ */