Module Name: src
Committed By: matt
Date: Tue Dec 14 23:44:50 UTC 2010
Modified Files:
src/sys/arch/vax/vax: autoconf.c bus_mem.c cfl.c clock.c cmi.c
compat_13_machdep.c compat_16_machdep.c conf.c core_machdep.c crl.c
ctu.c db_machdep.c disksubr.c gencons.c ibcs2_machdep.c ka410.c
ka43.c ka46.c ka48.c ka49.c ka53.c ka610.c ka630.c ka6400.c ka650.c
ka660.c ka670.c ka680.c ka730.c ka750.c ka780.c ka820.c ka860.c
ka88.c locore.c machdep.c multicpu.c nmi_mainbus.c pmap.c sbi.c
scb.c sgmap.c sig_machdep.c ubi.c vm_machdep.c xmi_mainbus.c
Log Message:
Cleanups includes. Change <machine/XXX.h> to <sys/XXX.h>
Remove unneeded includes.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/vax/vax/autoconf.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/vax/vax/bus_mem.c \
src/sys/arch/vax/vax/cmi.c src/sys/arch/vax/vax/ibcs2_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/vax/cfl.c \
src/sys/arch/vax/vax/sig_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/vax/vax/clock.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/vax/vax/compat_13_machdep.c \
src/sys/arch/vax/vax/compat_16_machdep.c src/sys/arch/vax/vax/ubi.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/vax/vax/conf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/vax/vax/core_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/vax/crl.c \
src/sys/arch/vax/vax/ka780.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/vax/vax/ctu.c \
src/sys/arch/vax/vax/multicpu.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vax/db_machdep.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vax/disksubr.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/vax/vax/gencons.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/vax/vax/ka410.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/vax/ka43.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/vax/vax/ka46.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/vax/ka48.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/vax/ka49.c \
src/sys/arch/vax/vax/scb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/vax/ka53.c \
src/sys/arch/vax/vax/ka670.c src/sys/arch/vax/vax/sgmap.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/vax/ka610.c \
src/sys/arch/vax/vax/xmi_mainbus.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/vax/ka630.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/vax/vax/ka6400.c \
src/sys/arch/vax/vax/ka88.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/vax/vax/ka650.c \
src/sys/arch/vax/vax/sbi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/vax/ka660.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/vax/ka680.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/vax/vax/ka730.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/vax/vax/ka750.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/vax/vax/ka820.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/ka860.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/vax/vax/locore.c
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/vax/vax/nmi_mainbus.c
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/vax/vax/vm_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/vax/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.91 src/sys/arch/vax/vax/autoconf.c:1.92
--- src/sys/arch/vax/vax/autoconf.c:1.91 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/autoconf.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.91 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,16 +31,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.91 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.92 2010/12/14 23:44:49 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cputype.h"
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/reboot.h>
#include <sys/disk.h>
#include <sys/buf.h>
#include <sys/bufq.h>
@@ -49,10 +49,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
-#include <machine/param.h>
-#include <machine/vmparam.h>
#include <machine/nexus.h>
#include <machine/ioa.h>
#include <machine/ka820.h>
@@ -60,7 +57,6 @@
#include <machine/ka650.h>
#include <machine/clock.h>
#include <machine/rpb.h>
-#include <machine/bus.h>
#include <machine/mainbus.h>
#include <vax/vax/gencons.h>
Index: src/sys/arch/vax/vax/bus_mem.c
diff -u src/sys/arch/vax/vax/bus_mem.c:1.12 src/sys/arch/vax/vax/bus_mem.c:1.13
--- src/sys/arch/vax/vax/bus_mem.c:1.12 Thu Nov 24 13:08:34 2005
+++ src/sys/arch/vax/vax/bus_mem.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_mem.c,v 1.12 2005/11/24 13:08:34 yamt Exp $ */
+/* $NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1998 Matt Thomas
* All rights reserved.
@@ -33,20 +33,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.12 2005/11/24 13:08:34 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_mem.c,v 1.13 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/types.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
-#include <machine/pmap.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
static int
vax_mem_bus_space_map(
Index: src/sys/arch/vax/vax/cmi.c
diff -u src/sys/arch/vax/vax/cmi.c:1.12 src/sys/arch/vax/vax/cmi.c:1.13
--- src/sys/arch/vax/vax/cmi.c:1.12 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/cmi.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cmi.c,v 1.12 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: cmi.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,15 +31,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmi.c,v 1.12 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmi.c,v 1.13 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
#include <machine/ka750.h>
#include <machine/mainbus.h>
Index: src/sys/arch/vax/vax/ibcs2_machdep.c
diff -u src/sys/arch/vax/vax/ibcs2_machdep.c:1.12 src/sys/arch/vax/vax/ibcs2_machdep.c:1.13
--- src/sys/arch/vax/vax/ibcs2_machdep.c:1.12 Thu Dec 10 14:13:53 2009
+++ src/sys/arch/vax/vax/ibcs2_machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_machdep.c,v 1.12 2009/12/10 14:13:53 matt Exp $ */
+/* $NetBSD: ibcs2_machdep.c,v 1.13 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_machdep.c,v 1.12 2009/12/10 14:13:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_machdep.c,v 1.13 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/proc.h>
#include <sys/exec.h>
#include <sys/signalvar.h>
#include <sys/signal.h>
-#include <machine/cpu.h>
#include <machine/psl.h>
#include <machine/reg.h>
#include <machine/vmparam.h>
Index: src/sys/arch/vax/vax/cfl.c
diff -u src/sys/arch/vax/vax/cfl.c:1.19 src/sys/arch/vax/vax/cfl.c:1.20
--- src/sys/arch/vax/vax/cfl.c:1.19 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/cfl.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cfl.c,v 1.19 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: cfl.c,v 1.20 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -71,16 +71,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfl.c,v 1.19 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfl.c,v 1.20 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
#include <machine/scb.h>
Index: src/sys/arch/vax/vax/sig_machdep.c
diff -u src/sys/arch/vax/vax/sig_machdep.c:1.19 src/sys/arch/vax/vax/sig_machdep.c:1.20
--- src/sys/arch/vax/vax/sig_machdep.c:1.19 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/sig_machdep.c Tue Dec 14 23:44:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.19 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.20 2010/12/14 23:44:50 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.19 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.20 2010/12/14 23:44:50 matt Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -94,44 +94,19 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/extent.h>
+#include <sys/cpu.h>
#include <sys/proc.h>
-#include <sys/time.h>
#include <sys/signal.h>
-#include <sys/kernel.h>
-#include <sys/msgbuf.h>
-#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/exec.h>
-#include <sys/mount.h>
-#include <sys/syscallargs.h>
-#include <sys/ptrace.h>
-#include <sys/ksyms.h>
-
-#include <dev/cons.h>
-
-#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-
-#include <machine/sid.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
+
#include <machine/macros.h>
-#include <machine/nexus.h>
-#include <machine/trap.h>
#include <machine/reg.h>
-#include <machine/db_machdep.h>
-#include <machine/scb.h>
-#include <vax/vax/gencons.h>
#ifdef DDB
+#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
#endif
+
typedef vaddr_t (*sig_setupstack_t)(const struct ksiginfo *, const sigset_t *,
int, struct lwp *, struct trapframe *, vaddr_t, int, vaddr_t);
Index: src/sys/arch/vax/vax/clock.c
diff -u src/sys/arch/vax/vax/clock.c:1.54 src/sys/arch/vax/vax/clock.c:1.55
--- src/sys/arch/vax/vax/clock.c:1.54 Fri Nov 19 03:31:24 2010
+++ src/sys/arch/vax/vax/clock.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.54 2010/11/19 03:31:24 uwe Exp $ */
+/* $NetBSD: clock.c,v 1.55 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -30,19 +30,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.54 2010/11/19 03:31:24 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.55 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/timetc.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/timetc.h>
+#include <sys/kernel.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
#include <machine/clock.h>
-#include <machine/cpu.h>
-#include <machine/uvax.h>
#include "opt_cputype.h"
Index: src/sys/arch/vax/vax/compat_13_machdep.c
diff -u src/sys/arch/vax/vax/compat_13_machdep.c:1.2 src/sys/arch/vax/vax/compat_13_machdep.c:1.3
--- src/sys/arch/vax/vax/compat_13_machdep.c:1.2 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/compat_13_machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_machdep.c,v 1.2 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: compat_13_machdep.c,v 1.3 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.2 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_machdep.c,v 1.3 2010/12/14 23:44:49 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -95,41 +95,22 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/extent.h>
#include <sys/proc.h>
-#include <sys/time.h>
#include <sys/signal.h>
-#include <sys/kernel.h>
-#include <sys/msgbuf.h>
-#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/exec.h>
-#include <sys/mount.h>
#include <sys/syscallargs.h>
-#include <sys/ptrace.h>
-#include <sys/ksyms.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
#include <dev/cons.h>
#include <compat/sys/signal.h>
#include <compat/sys/signalvar.h>
-#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-
-#include <machine/sid.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
#include <machine/macros.h>
-#include <machine/trap.h>
#include <machine/reg.h>
-#include <machine/db_machdep.h>
-#include <machine/scb.h>
-#include <machine/signal.h>
#include <vax/vax/gencons.h>
/*
Index: src/sys/arch/vax/vax/compat_16_machdep.c
diff -u src/sys/arch/vax/vax/compat_16_machdep.c:1.2 src/sys/arch/vax/vax/compat_16_machdep.c:1.3
--- src/sys/arch/vax/vax/compat_16_machdep.c:1.2 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/compat_16_machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.2 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.3 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.2 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.3 2010/12/14 23:44:49 matt Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -96,38 +96,18 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/extent.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/proc.h>
-#include <sys/time.h>
#include <sys/signal.h>
-#include <sys/kernel.h>
-#include <sys/msgbuf.h>
-#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/exec.h>
-#include <sys/mount.h>
#include <sys/syscallargs.h>
-#include <sys/ptrace.h>
-#include <sys/ksyms.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
#include <dev/cons.h>
-#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-
-#include <machine/sid.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
#include <machine/macros.h>
-#include <machine/trap.h>
#include <machine/reg.h>
-#include <machine/db_machdep.h>
-#include <machine/scb.h>
-#include <machine/signal.h>
#include <vax/vax/gencons.h>
/*
Index: src/sys/arch/vax/vax/ubi.c
diff -u src/sys/arch/vax/vax/ubi.c:1.2 src/sys/arch/vax/vax/ubi.c:1.3
--- src/sys/arch/vax/vax/ubi.c:1.2 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/ubi.c Tue Dec 14 23:44:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ubi.c,v 1.2 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,15 +31,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.2 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
#include <machine/ka730.h>
Index: src/sys/arch/vax/vax/conf.c
diff -u src/sys/arch/vax/vax/conf.c:1.66 src/sys/arch/vax/vax/conf.c:1.67
--- src/sys/arch/vax/vax/conf.c:1.66 Tue Aug 12 17:54:47 2008
+++ src/sys/arch/vax/vax/conf.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.66 2008/08/12 17:54:47 hans Exp $ */
+/* $NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -32,13 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.66 2008/08/12 17:54:47 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.67 2010/12/14 23:44:49 matt Exp $");
#include "opt_cputype.h"
#include <sys/param.h>
#include <sys/conf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
/*
* Console routines for VAX console.
Index: src/sys/arch/vax/vax/core_machdep.c
diff -u src/sys/arch/vax/vax/core_machdep.c:1.3 src/sys/arch/vax/vax/core_machdep.c:1.4
--- src/sys/arch/vax/vax/core_machdep.c:1.3 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/core_machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.3 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: core_machdep.c,v 1.4 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,32 +31,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.3 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.4 2010/12/14 23:44:49 matt Exp $");
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/exec.h>
-#include <sys/vnode.h>
#include <sys/core.h>
-#include <sys/mount.h>
-#include <sys/device.h>
#include <sys/exec_aout.h>
-#include <uvm/uvm_extern.h>
-
-#include <machine/vmparam.h>
-#include <machine/mtpr.h>
-#include <machine/pmap.h>
-#include <machine/pte.h>
-#include <machine/macros.h>
-#include <machine/trap.h>
#include <machine/pcb.h>
#include <machine/frame.h>
-#include <machine/cpu.h>
-#include <machine/sid.h>
/*
* Dump the machine specific header information at the start of a core dump.
Index: src/sys/arch/vax/vax/crl.c
diff -u src/sys/arch/vax/vax/crl.c:1.28 src/sys/arch/vax/vax/crl.c:1.29
--- src/sys/arch/vax/vax/crl.c:1.28 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/crl.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: crl.c,v 1.28 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: crl.c,v 1.29 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -40,16 +40,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.28 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.29 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
#include <machine/scb.h>
Index: src/sys/arch/vax/vax/ka780.c
diff -u src/sys/arch/vax/vax/ka780.c:1.28 src/sys/arch/vax/vax/ka780.c:1.29
--- src/sys/arch/vax/vax/ka780.c:1.28 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka780.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka780.c,v 1.28 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -35,16 +35,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.28 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/nexus.h>
#include <machine/sid.h>
-#include <machine/cpu.h>
#include <machine/clock.h>
#include "ioconf.h"
Index: src/sys/arch/vax/vax/ctu.c
diff -u src/sys/arch/vax/vax/ctu.c:1.30 src/sys/arch/vax/vax/ctu.c:1.31
--- src/sys/arch/vax/vax/ctu.c:1.30 Tue Jan 13 13:35:52 2009
+++ src/sys/arch/vax/vax/ctu.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ctu.c,v 1.30 2009/01/13 13:35:52 yamt Exp $ */
+/* $NetBSD: ctu.c,v 1.31 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -40,25 +40,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.30 2009/01/13 13:35:52 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ctu.c,v 1.31 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/callout.h>
-#include <sys/kernel.h>
#include <sys/buf.h>
#include <sys/bufq.h>
+#include <sys/callout.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
-#include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
#include <sys/proc.h>
-#include <sys/conf.h>
-#include <machine/mtpr.h>
#include <machine/rsp.h>
#include <machine/scb.h>
-#include <machine/trap.h>
#undef TUDEBUG
Index: src/sys/arch/vax/vax/multicpu.c
diff -u src/sys/arch/vax/vax/multicpu.c:1.30 src/sys/arch/vax/vax/multicpu.c:1.31
--- src/sys/arch/vax/vax/multicpu.c:1.30 Fri Nov 12 13:18:59 2010
+++ src/sys/arch/vax/vax/multicpu.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: multicpu.c,v 1.30 2010/11/12 13:18:59 uebayasi Exp $ */
+/* $NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,20 +35,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.30 2010/11/12 13:18:59 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/queue.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <sys/device.h>
#include <sys/xcall.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
#include <vax/vax/gencons.h>
#include "ioconf.h"
Index: src/sys/arch/vax/vax/db_machdep.c
diff -u src/sys/arch/vax/vax/db_machdep.c:1.56 src/sys/arch/vax/vax/db_machdep.c:1.57
--- src/sys/arch/vax/vax/db_machdep.c:1.56 Thu Jul 1 02:38:28 2010
+++ src/sys/arch/vax/vax/db_machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.56 2010/07/01 02:38:28 rmind Exp $ */
+/* $NetBSD: db_machdep.c,v 1.57 2010/12/14 23:44:49 matt Exp $ */
/*
* :set tabs=4
@@ -39,26 +39,24 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.56 2010/07/01 02:38:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.57 2010/12/14 23:44:49 matt Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
+#include <sys/systm.h> /* just for boothowto --eichin */
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/intr.h>
#include <sys/proc.h>
#include <sys/reboot.h>
-#include <sys/systm.h> /* just for boothowto --eichin */
-
-#include <uvm/uvm_extern.h>
#include <dev/cons.h>
-#include <machine/cpu.h>
#include <machine/db_machdep.h>
#include <machine/trap.h>
#include <machine/frame.h>
-#include <machine/pcb.h>
-#include <machine/intr.h>
#include <machine/rpb.h>
#include <vax/vax/gencons.h>
Index: src/sys/arch/vax/vax/disksubr.c
diff -u src/sys/arch/vax/vax/disksubr.c:1.51 src/sys/arch/vax/vax/disksubr.c:1.52
--- src/sys/arch/vax/vax/disksubr.c:1.51 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/disksubr.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.51 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: disksubr.c,v 1.52 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,11 +32,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.51 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.52 2010/12/14 23:44:49 matt Exp $");
+
+#include "opt_compat_ultrix.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/cpu.h>
#include <sys/dkbad.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
@@ -46,13 +49,9 @@
#include <uvm/uvm_extern.h>
#include <machine/macros.h>
-#include <machine/pte.h>
-#include <machine/pcb.h>
-#include <machine/cpu.h>
#include <dev/mscp/mscp.h> /* For disk encoding scheme */
-#include "opt_compat_ultrix.h"
#ifdef COMPAT_ULTRIX
#include <dev/dec/dec_boot.h>
#include <ufs/ufs/dinode.h> /* XXX for fs.h */
Index: src/sys/arch/vax/vax/gencons.c
diff -u src/sys/arch/vax/vax/gencons.c:1.50 src/sys/arch/vax/vax/gencons.c:1.51
--- src/sys/arch/vax/vax/gencons.c:1.50 Thu Apr 2 13:00:40 2009
+++ src/sys/arch/vax/vax/gencons.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gencons.c,v 1.50 2009/04/02 13:00:40 tsutsui Exp $ */
+/* $NetBSD: gencons.c,v 1.51 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@@ -36,29 +36,27 @@
/* All bugs are subject to removal without further notice */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.50 2009/04/02 13:00:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gencons.c,v 1.51 2010/12/14 23:44:49 matt Exp $");
#include "opt_ddb.h"
#include "opt_cputype.h"
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/file.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/reboot.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/kauth.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
#include <dev/cons.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/cpu.h>
#include <machine/scb.h>
#include <vax/vax/gencons.h>
Index: src/sys/arch/vax/vax/ka410.c
diff -u src/sys/arch/vax/vax/ka410.c:1.32 src/sys/arch/vax/vax/ka410.c:1.33
--- src/sys/arch/vax/vax/ka410.c:1.32 Wed Mar 18 16:00:16 2009
+++ src/sys/arch/vax/vax/ka410.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka410.c,v 1.32 2009/03/18 16:00:16 cegger Exp $ */
+/* $NetBSD: ka410.c,v 1.33 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,23 +33,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka410.c,v 1.32 2009/03/18 16:00:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka410.c,v 1.33 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/ka410.h>
#include <machine/ka420.h>
#include <machine/clock.h>
Index: src/sys/arch/vax/vax/ka43.c
diff -u src/sys/arch/vax/vax/ka43.c:1.34 src/sys/arch/vax/vax/ka43.c:1.35
--- src/sys/arch/vax/vax/ka43.c:1.34 Tue Dec 16 22:35:28 2008
+++ src/sys/arch/vax/vax/ka43.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka43.c,v 1.34 2008/12/16 22:35:28 christos Exp $ */
+/* $NetBSD: ka43.c,v 1.35 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,23 +33,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka43.c,v 1.34 2008/12/16 22:35:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka43.c,v 1.35 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/vsbus.h>
#include <machine/ka43.h>
#include <machine/clock.h>
Index: src/sys/arch/vax/vax/ka46.c
diff -u src/sys/arch/vax/vax/ka46.c:1.24 src/sys/arch/vax/vax/ka46.c:1.25
--- src/sys/arch/vax/vax/ka46.c:1.24 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka46.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka46.c,v 1.24 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka46.c,v 1.25 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,23 +33,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka46.c,v 1.24 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka46.c,v 1.25 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/ka410.h>
#include <machine/ka420.h>
#include <machine/ka46.h>
Index: src/sys/arch/vax/vax/ka48.c
diff -u src/sys/arch/vax/vax/ka48.c:1.20 src/sys/arch/vax/vax/ka48.c:1.21
--- src/sys/arch/vax/vax/ka48.c:1.20 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka48.c Tue Dec 14 23:44:49 2010
@@ -34,23 +34,16 @@
/*** needs to be completed MK-990306 ***/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka48.c,v 1.20 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka48.c,v 1.21 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/ka410.h>
#include <machine/ka420.h>
#include <machine/ka48.h>
Index: src/sys/arch/vax/vax/ka49.c
diff -u src/sys/arch/vax/vax/ka49.c:1.17 src/sys/arch/vax/vax/ka49.c:1.18
--- src/sys/arch/vax/vax/ka49.c:1.17 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka49.c Tue Dec 14 23:44:49 2010
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka49.c,v 1.17 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka49.c,v 1.18 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kernel.h>
#include <machine/clock.h>
-#include <machine/cpu.h>
#include <machine/scb.h>
#include <machine/mainbus.h>
Index: src/sys/arch/vax/vax/scb.c
diff -u src/sys/arch/vax/vax/scb.c:1.17 src/sys/arch/vax/vax/scb.c:1.18
--- src/sys/arch/vax/vax/scb.c:1.17 Sun Mar 12 17:14:41 2006
+++ src/sys/arch/vax/vax/scb.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scb.c,v 1.17 2006/03/12 17:14:41 matt Exp $ */
+/* $NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -34,19 +34,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.17 2006/03/12 17:14:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scb.c,v 1.18 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/kernel.h>
#include <machine/trap.h>
#include <machine/scb.h>
#include <machine/frame.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
-#include <machine/mtpr.h>
struct scb *scb;
struct ivec_dsp *scb_vec;
Index: src/sys/arch/vax/vax/ka53.c
diff -u src/sys/arch/vax/vax/ka53.c:1.15 src/sys/arch/vax/vax/ka53.c:1.16
--- src/sys/arch/vax/vax/ka53.c:1.15 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka53.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka53.c,v 1.15 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka53.c,v 1.16 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2002 Hugh Graham.
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -38,18 +38,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka53.c,v 1.15 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka53.c,v 1.16 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/kernel.h>
#include <machine/clock.h>
-#include <machine/cpu.h>
#include <machine/scb.h>
#include <machine/sid.h>
-#include <machine/mtpr.h>
static void ka53_conf(void);
static void ka53_memerr(void);
Index: src/sys/arch/vax/vax/ka670.c
diff -u src/sys/arch/vax/vax/ka670.c:1.15 src/sys/arch/vax/vax/ka670.c:1.16
--- src/sys/arch/vax/vax/ka670.c:1.15 Tue Dec 16 22:35:28 2008
+++ src/sys/arch/vax/vax/ka670.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka670.c,v 1.15 2008/12/16 22:35:28 christos Exp $ */
+/* $NetBSD: ka670.c,v 1.16 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,23 +33,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka670.c,v 1.15 2008/12/16 22:35:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka670.c,v 1.16 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/vsbus.h>
#include <machine/ka670.h>
#include <machine/clock.h>
Index: src/sys/arch/vax/vax/sgmap.c
diff -u src/sys/arch/vax/vax/sgmap.c:1.15 src/sys/arch/vax/vax/sgmap.c:1.16
--- src/sys/arch/vax/vax/sgmap.c:1.15 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/vax/sgmap.c Tue Dec 14 23:44:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sgmap.c,v 1.15 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: sgmap.c,v 1.16 2010/12/14 23:44:50 matt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,17 +31,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.15 2008/04/28 20:23:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgmap.c,v 1.16 2010/12/14 23:44:50 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
#include <machine/sgmap.h>
void
Index: src/sys/arch/vax/vax/ka610.c
diff -u src/sys/arch/vax/vax/ka610.c:1.7 src/sys/arch/vax/vax/ka610.c:1.8
--- src/sys/arch/vax/vax/ka610.c:1.7 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka610.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka610.c,v 1.7 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka610.c,v 1.8 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2001 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,16 +31,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka610.c,v 1.7 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka610.c,v 1.8 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
#include <machine/nexus.h>
-#include <machine/cpu.h>
#include <machine/clock.h>
#include <machine/sid.h>
Index: src/sys/arch/vax/vax/xmi_mainbus.c
diff -u src/sys/arch/vax/vax/xmi_mainbus.c:1.7 src/sys/arch/vax/vax/xmi_mainbus.c:1.8
--- src/sys/arch/vax/vax/xmi_mainbus.c:1.7 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/xmi_mainbus.c Tue Dec 14 23:44:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xmi_mainbus.c,v 1.7 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: xmi_mainbus.c,v 1.8 2010/12/14 23:44:50 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,17 +31,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmi_mainbus.c,v 1.7 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmi_mainbus.c,v 1.8 2010/12/14 23:44:50 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.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/xmi/xmivar.h>
Index: src/sys/arch/vax/vax/ka630.c
diff -u src/sys/arch/vax/vax/ka630.c:1.29 src/sys/arch/vax/vax/ka630.c:1.30
--- src/sys/arch/vax/vax/ka630.c:1.29 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka630.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka630.c,v 1.29 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka630.c,v 1.30 2010/12/14 23:44:49 matt Exp $ */
/*-
* Copyright (c) 1982, 1988, 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -31,21 +31,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka630.c,v 1.29 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka630.c,v 1.30 2010/12/14 23:44:49 matt Exp $");
+
+#include "opt_cputype.h"
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/time.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include "opt_cputype.h"
-#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <machine/ka630.h>
#include <machine/clock.h>
#include <machine/vsbus.h>
Index: src/sys/arch/vax/vax/ka6400.c
diff -u src/sys/arch/vax/vax/ka6400.c:1.14 src/sys/arch/vax/vax/ka6400.c:1.15
--- src/sys/arch/vax/vax/ka6400.c:1.14 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/ka6400.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka6400.c,v 1.14 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -40,24 +40,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.14 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/conf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
+#include <sys/time.h>
#include <machine/ka670.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
#include <machine/clock.h>
#include <machine/scb.h>
-#include <machine/bus.h>
#include <machine/sid.h>
#include <machine/cca.h>
#include <machine/rpb.h>
Index: src/sys/arch/vax/vax/ka88.c
diff -u src/sys/arch/vax/vax/ka88.c:1.14 src/sys/arch/vax/vax/ka88.c:1.15
--- src/sys/arch/vax/vax/ka88.c:1.14 Sat Nov 21 04:45:39 2009
+++ src/sys/arch/vax/vax/ka88.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka88.c,v 1.14 2009/11/21 04:45:39 rmind Exp $ */
+/* $NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -39,27 +39,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.14 2009/11/21 04:45:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/conf.h>
+#include <sys/bus.h>
#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/lwp.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
#include <machine/clock.h>
#include <machine/scb.h>
-#include <machine/bus.h>
#include <machine/sid.h>
-#include <machine/pcb.h>
#include <machine/rpb.h>
#include <machine/ka88.h>
Index: src/sys/arch/vax/vax/ka650.c
diff -u src/sys/arch/vax/vax/ka650.c:1.35 src/sys/arch/vax/vax/ka650.c:1.36
--- src/sys/arch/vax/vax/ka650.c:1.35 Tue Dec 16 22:35:28 2008
+++ src/sys/arch/vax/vax/ka650.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka650.c,v 1.35 2008/12/16 22:35:28 christos Exp $ */
+/* $NetBSD: ka650.c,v 1.36 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -38,21 +38,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.35 2008/12/16 22:35:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.36 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-
-#include <uvm/uvm_extern.h>
+#include <sys/kernel.h>
+#include <sys/time.h>
#include <machine/ka650.h>
#include <machine/clock.h>
-#include <machine/cpu.h>
-#include <machine/psl.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
struct ka650_merr *ka650merr_ptr;
Index: src/sys/arch/vax/vax/sbi.c
diff -u src/sys/arch/vax/vax/sbi.c:1.35 src/sys/arch/vax/vax/sbi.c:1.36
--- src/sys/arch/vax/vax/sbi.c:1.35 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/sbi.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbi.c,v 1.35 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: sbi.c,v 1.36 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -38,16 +38,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbi.c,v 1.35 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbi.c,v 1.36 2010/12/14 23:44:49 matt Exp $");
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/sid.h>
-#include <machine/cpu.h>
#include <machine/nexus.h>
#include <machine/mainbus.h>
#include <machine/ioa.h>
Index: src/sys/arch/vax/vax/ka660.c
diff -u src/sys/arch/vax/vax/ka660.c:1.9 src/sys/arch/vax/vax/ka660.c:1.10
--- src/sys/arch/vax/vax/ka660.c:1.9 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka660.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka660.c,v 1.9 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,23 +31,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.9 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/ka410.h>
#include <machine/ka420.h>
#include <machine/clock.h>
Index: src/sys/arch/vax/vax/ka680.c
diff -u src/sys/arch/vax/vax/ka680.c:1.16 src/sys/arch/vax/vax/ka680.c:1.17
--- src/sys/arch/vax/vax/ka680.c:1.16 Tue Mar 11 05:34:03 2008
+++ src/sys/arch/vax/vax/ka680.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka680.c,v 1.16 2008/03/11 05:34:03 matt Exp $ */
+/* $NetBSD: ka680.c,v 1.17 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2002 Hugh Graham.
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
@@ -35,20 +35,16 @@
/* minor modifications for KA690 cache support by [email protected] */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka680.c,v 1.16 2008/03/11 05:34:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka680.c,v 1.17 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <machine/pte.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/sid.h>
#include <machine/nexus.h>
-#include <machine/uvax.h>
#include <machine/ka680.h>
#include <machine/clock.h>
#include <machine/scb.h>
Index: src/sys/arch/vax/vax/ka730.c
diff -u src/sys/arch/vax/vax/ka730.c:1.1 src/sys/arch/vax/vax/ka730.c:1.2
--- src/sys/arch/vax/vax/ka730.c:1.1 Thu Jan 22 18:49:03 2009
+++ src/sys/arch/vax/vax/ka730.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka730.c,v 1.1 2009/01/22 18:49:03 christos Exp $ */
+/* $NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,16 +68,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.1 2009/01/22 18:49:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/ka730.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
#include <machine/clock.h>
#include <machine/sid.h>
Index: src/sys/arch/vax/vax/ka750.c
diff -u src/sys/arch/vax/vax/ka750.c:1.43 src/sys/arch/vax/vax/ka750.c:1.44
--- src/sys/arch/vax/vax/ka750.c:1.43 Sat Mar 15 00:23:17 2008
+++ src/sys/arch/vax/vax/ka750.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka750.c,v 1.43 2008/03/15 00:23:17 matt Exp $ */
+/* $NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,16 +68,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.43 2008/03/15 00:23:17 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/bus.h>
#include <machine/ka750.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
#include <machine/clock.h>
#include <machine/sid.h>
Index: src/sys/arch/vax/vax/ka820.c
diff -u src/sys/arch/vax/vax/ka820.c:1.52 src/sys/arch/vax/vax/ka820.c:1.53
--- src/sys/arch/vax/vax/ka820.c:1.52 Sat Dec 12 14:44:09 2009
+++ src/sys/arch/vax/vax/ka820.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka820.c,v 1.52 2009/12/12 14:44:09 tsutsui Exp $ */
+/* $NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -39,27 +39,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.52 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
#include <sys/systm.h>
-#include <sys/conf.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
#include <sys/proc.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/ka820.h>
-#include <machine/cpu.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
#include <machine/clock.h>
#include <machine/scb.h>
-#include <machine/bus.h>
#include <machine/mainbus.h>
#include <dev/cons.h>
Index: src/sys/arch/vax/vax/ka860.c
diff -u src/sys/arch/vax/vax/ka860.c:1.33 src/sys/arch/vax/vax/ka860.c:1.34
--- src/sys/arch/vax/vax/ka860.c:1.33 Thu Jul 1 19:50:12 2010
+++ src/sys/arch/vax/vax/ka860.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ka860.c,v 1.33 2010/07/01 19:50:12 ragge Exp $ */
+/* $NetBSD: ka860.c,v 1.34 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1986, 1988 Regents of the University of California.
* All rights reserved.
@@ -41,15 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka860.c,v 1.33 2010/07/01 19:50:12 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka860.c,v 1.34 2010/12/14 23:44:49 matt Exp $");
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
-#include <machine/cpu.h>
#include <machine/clock.h>
-#include <machine/mtpr.h>
#include <machine/nexus.h>
#include <machine/ioa.h>
#include <machine/sid.h>
Index: src/sys/arch/vax/vax/locore.c
diff -u src/sys/arch/vax/vax/locore.c:1.78 src/sys/arch/vax/vax/locore.c:1.79
--- src/sys/arch/vax/vax/locore.c:1.78 Fri Nov 27 03:23:14 2009
+++ src/sys/arch/vax/vax/locore.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.c,v 1.78 2009/11/27 03:23:14 rmind Exp $ */
+/* $NetBSD: locore.c,v 1.79 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -32,25 +32,20 @@
/* All bugs are subject to removal without further notice */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.c,v 1.78 2009/11/27 03:23:14 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.c,v 1.79 2010/12/14 23:44:49 matt Exp $");
#include "opt_compat_netbsd.h"
#include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
#include <sys/proc.h>
+#include <sys/reboot.h>
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#include <machine/pcb.h>
-#include <machine/pte.h>
-#include <machine/pmap.h>
#include <machine/nexus.h>
#include <machine/rpb.h>
Index: src/sys/arch/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.179 src/sys/arch/vax/vax/machdep.c:1.180
--- src/sys/arch/vax/vax/machdep.c:1.179 Mon Feb 8 19:02:32 2010
+++ src/sys/arch/vax/vax/machdep.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.179 2010/02/08 19:02:32 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.180 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.179 2010/02/08 19:02:32 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.180 2010/12/14 23:44:49 matt Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -95,42 +95,36 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/extent.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <sys/kernel.h>
-#include <sys/msgbuf.h>
#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/reboot.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/exec.h>
+#include <sys/extent.h>
+#include <sys/kernel.h>
+#include <sys/ksyms.h>
#include <sys/mount.h>
-#include <sys/syscallargs.h>
+#include <sys/msgbuf.h>
+#include <sys/mbuf.h>
+#include <sys/proc.h>
#include <sys/ptrace.h>
-#include <sys/ksyms.h>
+#include <sys/reboot.h>
+#include <sys/savar.h> /* for cpu_upcall */
+#include <sys/sysctl.h>
+#include <sys/time.h>
#include <dev/cons.h>
#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
-#include <sys/savar.h> /* for cpu_upcall */
#include <machine/sid.h>
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
#include <machine/macros.h>
#include <machine/nexus.h>
-#include <machine/trap.h>
#include <machine/reg.h>
-#include <machine/db_machdep.h>
#include <machine/scb.h>
#include <vax/vax/gencons.h>
#ifdef DDB
+#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
#endif
Index: src/sys/arch/vax/vax/nmi_mainbus.c
diff -u src/sys/arch/vax/vax/nmi_mainbus.c:1.10 src/sys/arch/vax/vax/nmi_mainbus.c:1.11
--- src/sys/arch/vax/vax/nmi_mainbus.c:1.10 Sat Mar 15 00:24:13 2008
+++ src/sys/arch/vax/vax/nmi_mainbus.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nmi_mainbus.c,v 1.10 2008/03/15 00:24:13 matt Exp $ */
+/* $NetBSD: nmi_mainbus.c,v 1.11 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,18 +31,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nmi_mainbus.c,v 1.10 2008/03/15 00:24:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nmi_mainbus.c,v 1.11 2010/12/14 23:44:49 matt Exp $");
+
+#define _VAX_BUS_DMA_PRIVATE
#include <sys/param.h>
-#include <sys/device.h>
#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/device.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 <machine/mainbus.h>
Index: src/sys/arch/vax/vax/pmap.c
diff -u src/sys/arch/vax/vax/pmap.c:1.178 src/sys/arch/vax/vax/pmap.c:1.179
--- src/sys/arch/vax/vax/pmap.c:1.178 Wed Nov 10 09:27:24 2010
+++ src/sys/arch/vax/vax/pmap.c Tue Dec 14 23:44:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.178 2010/11/10 09:27:24 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.179 2010/12/14 23:44:49 matt Exp $ */
/*
* Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.178 2010/11/10 09:27:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179 2010/12/14 23:44:49 matt Exp $");
#include "opt_ddb.h"
#include "opt_cputype.h"
@@ -39,15 +39,14 @@
#include "opt_lockdebug.h"
#include "opt_pipe.h"
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/extent.h>
-#include <sys/proc.h>
#include <sys/systm.h>
-#include <sys/device.h>
#include <sys/buf.h>
+#include <sys/cpu.h>
+#include <sys/device.h>
+#include <sys/extent.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
#include <uvm/uvm.h>
@@ -55,14 +54,8 @@
#include <dev/cons.h>
#endif
-#include <uvm/uvm.h>
-
-#include <machine/pte.h>
-#include <machine/pcb.h>
-#include <machine/mtpr.h>
#include <machine/macros.h>
#include <machine/sid.h>
-#include <machine/cpu.h>
#include <machine/scb.h>
#include <machine/rpb.h>
Index: src/sys/arch/vax/vax/vm_machdep.c
diff -u src/sys/arch/vax/vax/vm_machdep.c:1.112 src/sys/arch/vax/vax/vm_machdep.c:1.113
--- src/sys/arch/vax/vax/vm_machdep.c:1.112 Sat Mar 20 23:31:30 2010
+++ src/sys/arch/vax/vax/vm_machdep.c Tue Dec 14 23:44:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.112 2010/03/20 23:31:30 chs Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.113 2010/12/14 23:44:50 matt Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,42 +31,31 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.112 2010/03/20 23:31:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.113 2010/12/14 23:44:50 matt Exp $");
#include "opt_execfmt.h"
#include "opt_compat_ultrix.h"
#include "opt_multiprocessor.h"
#include "opt_sa.h"
+#include "opt_cputype.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/buf.h>
+#include <sys/core.h>
+#include <sys/cpu.h>
#include <sys/exec.h>
#include <sys/exec_aout.h>
-#include <sys/vnode.h>
-#include <sys/core.h>
-#include <sys/mount.h>
-#include <sys/device.h>
-#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/syscallargs.h>
#include <uvm/uvm_extern.h>
#include <machine/vmparam.h>
-#include <machine/mtpr.h>
-#include <machine/pmap.h>
-#include <machine/pte.h>
#include <machine/macros.h>
-#include <machine/trap.h>
-#include <machine/pcb.h>
#include <machine/frame.h>
-#include <machine/cpu.h>
#include <machine/sid.h>
-#include <sys/syscallargs.h>
-
-#include "opt_cputype.h"
-
/*
* Finish a fork operation, with process p2 nearly set up.
* Copy and update the pcb and trap frame, making the child ready to run.
