summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-11-06 19:53:22 +0000
commit1a05584a00bbab0c5d169a8d3af7b22cafbfd92e (patch)
tree5ddd0ec6d94f69ad3960926e58a87b6d82166c7a /sys/arch/macppc
parentef75d88ca83504eb18013af4622826ef9b5ff28d (diff)
Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.
(Look ma, I might have broken the tree)
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/dev/dbdma.c4
-rw-r--r--sys/arch/macppc/dev/if_bm.c4
-rw-r--r--sys/arch/macppc/dev/if_gm.c4
-rw-r--r--sys/arch/macppc/dev/macintr.c3
-rw-r--r--sys/arch/macppc/dev/mesh.c5
-rw-r--r--sys/arch/macppc/dev/openpic.c3
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c4
-rw-r--r--sys/arch/macppc/macppc/db_memrw.c4
-rw-r--r--sys/arch/macppc/macppc/dma.c3
-rw-r--r--sys/arch/macppc/macppc/genassym.cf4
-rw-r--r--sys/arch/macppc/macppc/machdep.c3
-rw-r--r--sys/arch/macppc/macppc/mem.c3
-rw-r--r--sys/arch/macppc/macppc/ofw_machdep.c4
-rw-r--r--sys/arch/macppc/pci/mpcpcibus.c4
-rw-r--r--sys/arch/macppc/pci/vgafb.c3
15 files changed, 24 insertions, 31 deletions
diff --git a/sys/arch/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c
index e936ad7a2e1..2756fb9a48c 100644
--- a/sys/arch/macppc/dev/dbdma.c
+++ b/sys/arch/macppc/dev/dbdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dbdma.c,v 1.3 2001/09/15 01:51:11 mickey Exp $ */
+/* $OpenBSD: dbdma.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: dbdma.c,v 1.2 1998/08/21 16:13:28 tsubai Exp $ */
/*
@@ -27,7 +27,7 @@
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <macppc/dev/dbdma.h>
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 5f7e8b9f0fb..2de5d04879d 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bm.c,v 1.4 2001/09/16 03:19:30 drahn Exp $ */
+/* $OpenBSD: if_bm.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $ */
/*-
@@ -52,7 +52,7 @@
#include <net/bpfdesc.h>
#endif
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c
index 95336155633..dfd6e1e282d 100644
--- a/sys/arch/macppc/dev/if_gm.c
+++ b/sys/arch/macppc/dev/if_gm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gm.c,v 1.3 2001/09/05 16:54:01 mickey Exp $ */
+/* $OpenBSD: if_gm.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: if_gm.c,v 1.14 2001/07/22 11:29:46 wiz Exp $ */
/*-
@@ -41,7 +41,7 @@
#include <sys/socket.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 4e0f5cc1379..f923b274944 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macintr.c,v 1.5 2001/10/03 14:07:05 drahn Exp $ */
+/* $OpenBSD: macintr.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -47,7 +47,6 @@
#include <sys/socket.h>
#include <sys/systm.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index f5437892893..f846159524a 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesh.c,v 1.2 2001/09/15 01:51:11 mickey Exp $ */
+/* $OpenBSD: mesh.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
@@ -41,8 +41,7 @@
#include <sys/queue.h>
#include <sys/systm.h>
-#include <vm/vm.h>
-
+#include <uvm/uvm_extern.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index b4eceb54352..ea6cf258f2d 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpic.c,v 1.6 2001/10/03 14:07:05 drahn Exp $ */
+/* $OpenBSD: openpic.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -47,7 +47,6 @@
#include <sys/socket.h>
#include <sys/systm.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index b7d81a99518..7fa3316321f 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_obio.c,v 1.3 2001/09/15 01:51:11 mickey Exp $ */
+/* $OpenBSD: wdc_obio.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $ */
/*-
@@ -42,7 +42,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/bus.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/macppc/macppc/db_memrw.c b/sys/arch/macppc/macppc/db_memrw.c
index 226c2417bfd..d8dc2405755 100644
--- a/sys/arch/macppc/macppc/db_memrw.c
+++ b/sys/arch/macppc/macppc/db_memrw.c
@@ -1,5 +1,5 @@
/* $NetBSD: db_memrw.c,v 1.4 2001/05/18 20:38:27 matt Exp $ */
-/* $OpenBSD: db_memrw.c,v 1.2 2001/09/09 23:56:40 drahn Exp $ */
+/* $OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */
/*
* Mach Operating System
@@ -42,7 +42,7 @@
#include <sys/proc.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/db_machdep.h>
#include <machine/pcb.h>
diff --git a/sys/arch/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c
index c7b1b7198f6..322081c5f34 100644
--- a/sys/arch/macppc/macppc/dma.c
+++ b/sys/arch/macppc/macppc/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.4 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: dma.c,v 1.5 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -51,7 +51,6 @@
#include <sys/mbuf.h>
#include <sys/mount.h>
-#include <vm/vm.h>
#include <uvm/uvm.h>
#include <uvm/uvm_page.h>
diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf
index 9f649b1acf2..9d3aa02c871 100644
--- a/sys/arch/macppc/macppc/genassym.cf
+++ b/sys/arch/macppc/macppc/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.3 2001/09/16 14:28:04 miod Exp $
+# $OpenBSD: genassym.cf,v 1.4 2001/11/06 19:53:15 miod Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -37,7 +37,7 @@
include <sys/param.h>
include <sys/time.h>
include <sys/proc.h>
-include <vm/vm.h>
+include <uvm/uvm_extern.h>
include <machine/pcb.h>
include <machine/pmap.h>
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index ec843d7ad35..ee8527df884 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.10 2001/11/05 22:26:57 drahn Exp $ */
+/* $OpenBSD: machdep.c,v 1.11 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -53,7 +53,6 @@
#include <sys/systm.h>
#include <sys/user.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#ifdef SYSVSHM
diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c
index 5c56aa1d18e..a35222c0271 100644
--- a/sys/arch/macppc/macppc/mem.c
+++ b/sys/arch/macppc/macppc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.2 2001/11/01 12:13:46 art Exp $ */
+/* $OpenBSD: mem.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -55,7 +55,6 @@
#include <machine/cpu.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/conf.h>
diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c
index c2e98403d94..1cdc61e33fd 100644
--- a/sys/arch/macppc/macppc/ofw_machdep.c
+++ b/sys/arch/macppc/macppc/ofw_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofw_machdep.c,v 1.3 2001/10/01 22:47:48 drahn Exp $ */
+/* $OpenBSD: ofw_machdep.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -43,7 +43,7 @@
#include <sys/stat.h>
#include <sys/systm.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/powerpc.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index cc1f25ca5f4..74b5160ba29 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpcpcibus.c,v 1.2 2001/09/21 02:11:58 miod Exp $ */
+/* $OpenBSD: mpcpcibus.c,v 1.3 2001/11/06 19:53:15 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -43,7 +43,7 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/bat.h>
diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index 0e5cdb868d4..1a4c448dcb5 100644
--- a/sys/arch/macppc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgafb.c,v 1.3 2001/09/17 15:10:36 drahn Exp $ */
+/* $OpenBSD: vgafb.c,v 1.4 2001/11/06 19:53:15 miod Exp $ */
/* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */
/*
@@ -34,7 +34,6 @@
#include <sys/device.h>
#include <sys/buf.h>
-#include <vm/vm.h>
#include <uvm/uvm_extern.h>
#include <machine/bus.h>