summaryrefslogtreecommitdiff
path: root/sys/arch/hp300
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hp300')
-rw-r--r--sys/arch/hp300/dev/grf.c4
-rw-r--r--sys/arch/hp300/hp300/db_memrw.c4
-rw-r--r--sys/arch/hp300/hp300/genassym.cf4
-rw-r--r--sys/arch/hp300/hp300/hpux_machdep.c4
-rw-r--r--sys/arch/hp300/hp300/intr.c3
-rw-r--r--sys/arch/hp300/hp300/leds.c4
-rw-r--r--sys/arch/hp300/hp300/mem.c3
-rw-r--r--sys/arch/hp300/hp300/pmap_bootstrap.c6
-rw-r--r--sys/arch/hp300/hp300/sys_machdep.c4
-rw-r--r--sys/arch/hp300/hp300/trap.c6
-rw-r--r--sys/arch/hp300/hp300/vm_machdep.c3
11 files changed, 17 insertions, 28 deletions
diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c
index b54ba27555b..feb437cb0a7 100644
--- a/sys/arch/hp300/dev/grf.c
+++ b/sys/arch/hp300/dev/grf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf.c,v 1.15 2001/11/01 12:13:46 art Exp $ */
+/* $OpenBSD: grf.c,v 1.16 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */
/*
@@ -73,8 +73,6 @@
extern struct emul emul_hpux;
#endif
-#include <vm/vm.h>
-
#include <uvm/uvm.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c
index 66ee26c9c35..1a1a62c9405 100644
--- a/sys/arch/hp300/hp300/db_memrw.c
+++ b/sys/arch/hp300/hp300/db_memrw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_memrw.c,v 1.6 2001/11/04 02:58:54 miod Exp $ */
+/* $OpenBSD: db_memrw.c,v 1.7 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $ */
/*-
@@ -60,7 +60,7 @@
#include <sys/systm.h>
#include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/pte.h>
#include <machine/db_machdep.h>
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index 5dcbd8eb2f7..da0f8ff1f3f 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.13 2001/11/04 02:58:54 miod Exp $
+# $OpenBSD: genassym.cf,v 1.14 2001/11/06 19:53:14 miod Exp $
# $NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
#
@@ -45,8 +45,6 @@ include <sys/msgbuf.h>
include <sys/syscall.h>
include <sys/user.h>
-include <vm/vm.h>
-
include <uvm/uvm_extern.h>
include <machine/hp300spu.h>
diff --git a/sys/arch/hp300/hp300/hpux_machdep.c b/sys/arch/hp300/hp300/hpux_machdep.c
index 76ce58bf874..6614bb8f05f 100644
--- a/sys/arch/hp300/hp300/hpux_machdep.c
+++ b/sys/arch/hp300/hp300/hpux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_machdep.c,v 1.10 2001/08/11 23:21:13 art Exp $ */
+/* $OpenBSD: hpux_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: hpux_machdep.c,v 1.19 1998/02/16 20:58:30 thorpej Exp $ */
/*
@@ -74,8 +74,6 @@
#include <machine/psl.h>
#include <machine/vmparam.h>
-#include <vm/vm.h>
-
#include <uvm/uvm_extern.h>
#include <sys/syscallargs.h>
diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c
index 3995d0efa7d..83bb9f239c3 100644
--- a/sys/arch/hp300/hp300/intr.c
+++ b/sys/arch/hp300/hp300/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.8 2001/06/27 04:05:45 art Exp $ */
+/* $OpenBSD: intr.c,v 1.9 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */
/*-
@@ -48,7 +48,6 @@
#include <sys/malloc.h>
#include <sys/vmmeter.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <net/netisr.h>
diff --git a/sys/arch/hp300/hp300/leds.c b/sys/arch/hp300/hp300/leds.c
index 3156cd73618..02ddbbc6cfd 100644
--- a/sys/arch/hp300/hp300/leds.c
+++ b/sys/arch/hp300/hp300/leds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: leds.c,v 1.4 2001/07/25 13:25:31 art Exp $ */
+/* $OpenBSD: leds.c,v 1.5 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: leds.c,v 1.1 1997/05/05 20:54:35 thorpej Exp $ */
/*
@@ -45,7 +45,7 @@
#include <sys/param.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <arch/hp300/hp300/leds.h>
diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c
index 9cf245677a1..84c4b8b919f 100644
--- a/sys/arch/hp300/hp300/mem.c
+++ b/sys/arch/hp300/hp300/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.16 2001/11/01 12:13:46 art Exp $ */
+/* $OpenBSD: mem.c,v 1.17 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */
/*
@@ -55,7 +55,6 @@
#include <machine/cpu.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
extern u_int lowram;
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c
index 510f7a815e0..d383698a57e 100644
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.10 2001/09/19 21:32:57 miod Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */
/*
@@ -52,8 +52,8 @@
#include <hp300/hp300/clockreg.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_pmap.h>
#define RELOC(v, t) *((t*)((u_int)&(v) + firstpa))
diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c
index 50d432f5d4a..2d04cc2d06a 100644
--- a/sys/arch/hp300/hp300/sys_machdep.c
+++ b/sys/arch/hp300/hp300/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.10 2001/11/04 02:58:54 miod Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: sys_machdep.c,v 1.17 1997/05/19 10:15:00 veego Exp $ */
/*
@@ -49,7 +49,7 @@
#include <sys/buf.h>
#include <sys/mount.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <sys/syscallargs.h>
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index a602ad607dc..b858e3925d8 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.30 2001/11/06 18:41:09 art Exp $ */
+/* $OpenBSD: trap.c,v 1.31 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */
/*
@@ -95,10 +95,8 @@
#include <machine/reg.h>
#include <machine/intr.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_pmap.h>
#include <dev/cons.h>
diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c
index 5c1fc78828e..3d63c43b503 100644
--- a/sys/arch/hp300/hp300/vm_machdep.c
+++ b/sys/arch/hp300/hp300/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.32 2001/11/06 18:41:09 art Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.33 2001/11/06 19:53:14 miod Exp $ */
/* $NetBSD: vm_machdep.c,v 1.47 1999/03/26 23:41:29 mycroft Exp $ */
/*
@@ -59,7 +59,6 @@
#include <machine/pte.h>
#include <machine/reg.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
/*