diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index c883f6293e05..70f2a81e8980 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.179 2001/05/05 18:22:04 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.180 2001/05/26 21:27:02 chs Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -154,7 +154,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179 2001/05/05 18:22:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.180 2001/05/26 21:27:02 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -474,7 +474,7 @@ void	alpha_protection_init(void);
 void	pmap_do_remove(pmap_t, vaddr_t, vaddr_t, boolean_t);
 boolean_t pmap_remove_mapping(pmap_t, vaddr_t, pt_entry_t *,
 	    boolean_t, long);
-void	pmap_changebit(vm_page_t, pt_entry_t, pt_entry_t, long);
+void	pmap_changebit(struct vm_page *, pt_entry_t, pt_entry_t, long);
 
 /*
  * PT page management functions.
@@ -495,8 +495,9 @@ int	pmap_l1pt_ctor(void *, void *, int);
 /*
  * PV table management functions.
  */
-int	pmap_pv_enter(pmap_t, vm_page_t, vaddr_t, pt_entry_t *, boolean_t);
-void	pmap_pv_remove(pmap_t, vm_page_t, vaddr_t, boolean_t);
+int	pmap_pv_enter(pmap_t, struct vm_page *, vaddr_t, pt_entry_t *,
+	    boolean_t);
+void	pmap_pv_remove(pmap_t, struct vm_page *, vaddr_t, boolean_t);
 void	*pmap_pv_page_alloc(u_long, int, int);
 void	pmap_pv_page_free(void *, u_long, int);
 #ifdef DEBUG
@@ -1458,7 +1459,7 @@ pmap_do_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva, boolean_t dowired)
  *	the permissions specified.
  */
 void
-pmap_page_protect(vm_page_t pg, vm_prot_t prot)
+pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
 {
 	pmap_t pmap;
 	pv_entry_t pv, nextpv;
@@ -1625,7 +1626,7 @@ pmap_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
 int
 pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
 {
-	vm_page_t pg;			/* if != NULL, managed page */
+	struct vm_page *pg;			/* if != NULL, managed page */
 	pt_entry_t *pte, npte, opte;
 	paddr_t opa;
 	boolean_t tflush = TRUE;
@@ -2410,7 +2411,7 @@ pmap_pageidlezero(paddr_t pa)
  *	Clear the modify bits on the specified physical page.
  */
 boolean_t
-pmap_clear_modify(vm_page_t pg)
+pmap_clear_modify(struct vm_page *pg)
 {
 	boolean_t rv = FALSE;
 	long cpu_id = cpu_number();
@@ -2441,7 +2442,7 @@ pmap_clear_modify(vm_page_t pg)
  *	Clear the reference bit on the specified physical page.
  */
 boolean_t
-pmap_clear_reference(vm_page_t pg)
+pmap_clear_reference(struct vm_page *pg)
 {
 	boolean_t rv = FALSE;
 	long cpu_id = cpu_number();
@@ -2577,7 +2578,7 @@ pmap_remove_mapping(pmap_t pmap, vaddr_t va, pt_entry_t *pte,
     boolean_t dolock, long cpu_id)
 {
 	paddr_t pa;
-	vm_page_t pg;		/* if != NULL, page is managed */
+	struct vm_page *pg;		/* if != NULL, page is managed */
 	boolean_t onpv;
 	boolean_t hadasm;
 	boolean_t isactive;
@@ -2680,7 +2681,7 @@ pmap_remove_mapping(pmap_t pmap, vaddr_t va, pt_entry_t *pte,
  *	XXX optimization done.
  */
 void
-pmap_changebit(vm_page_t pg, u_long set, u_long mask, long cpu_id)
+pmap_changebit(struct vm_page *pg, u_long set, u_long mask, long cpu_id)
 {
 	pv_entry_t pv;
 	pt_entry_t *pte, npte;
@@ -2756,7 +2757,7 @@ void
 pmap_emulate_reference(struct proc *p, vaddr_t v, int user, int write)
 {
 	pt_entry_t faultoff, *pte;
-	vm_page_t pg;
+	struct vm_page *pg;
 	paddr_t pa;
 	boolean_t didlock = FALSE;
 	long cpu_id = cpu_number();
@@ -2873,7 +2874,7 @@ pmap_emulate_reference(struct proc *p, vaddr_t v, int user, int write)
 void
 pmap_pv_dump(paddr_t pa)
 {
-	vm_page_t pg;
+	struct vm_page *pg;
 	pv_entry_t pv;
 
 	pg = PHYS_TO_VM_PAGE(pa);
@@ -2929,7 +2930,7 @@ vtophys(vaddr_t vaddr)
  *	Add a physical->virtual entry to the pv_table.
  */
 int
-pmap_pv_enter(pmap_t pmap, vm_page_t pg, vaddr_t va, pt_entry_t *pte,
+pmap_pv_enter(pmap_t pmap, struct vm_page *pg, vaddr_t va, pt_entry_t *pte,
     boolean_t dolock)
 {
 	pv_entry_t newpv;
@@ -2980,7 +2981,7 @@ pmap_pv_enter(pmap_t pmap, vm_page_t pg, vaddr_t va, pt_entry_t *pte,
  *	Remove a physical->virtual entry from the pv_table.
  */
 void
-pmap_pv_remove(pmap_t pmap, vm_page_t pg, vaddr_t va, boolean_t dolock)
+pmap_pv_remove(pmap_t pmap, struct vm_page *pg, vaddr_t va, boolean_t dolock)
 {
 	pv_entry_t pv, *pvp;
 
@@ -3105,7 +3106,7 @@ pmap_physpage_free(paddr_t pa)
 int
 pmap_physpage_addref(void *kva)
 {
-	vm_page_t pg;
+	struct vm_page *pg;
 	paddr_t pa;
 	int rval;
 
@@ -3127,7 +3128,7 @@ pmap_physpage_addref(void *kva)
 int
 pmap_physpage_delref(void *kva)
 {
-	vm_page_t pg;
+	struct vm_page *pg;
 	paddr_t pa;
 	int rval;
 
diff --git a/sys/arch/alpha/common/bus_dma.c b/sys/arch/alpha/common/bus_dma.c
index 122c23033e75..13fd44c0d64b 100644
--- a/sys/arch/alpha/common/bus_dma.c
+++ b/sys/arch/alpha/common/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.45 2001/04/24 04:30:51 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.46 2001/05/26 21:27:03 chs Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.45 2001/04/24 04:30:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.46 2001/05/26 21:27:03 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -432,7 +432,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
     int flags, paddr_t low, paddr_t high)
 {
 	paddr_t curaddr, lastaddr;
-	vm_page_t m;    
+	struct vm_page *m;    
 	struct pglist mlist;
 	int curseg, error;
 
@@ -491,7 +491,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
 void
 _bus_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index 7eba4a704c78..f9e610ae3637 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.49 2001/05/01 05:33:13 thorpej Exp $ */
+/* $NetBSD: pmap.h,v 1.50 2001/05/26 21:27:03 chs Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ typedef struct pmap	*pmap_t;
 extern u_long		kernel_pmap_store[];
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  */
 typedef struct pv_entry {
diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index 507040a3c295..9e7e9380de5d 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.87 2001/04/24 04:30:52 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.88 2001/05/26 21:27:03 chs Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -2185,7 +2185,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2202,7 +2202,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2645,7 +2645,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h
index ee64c58ccc67..7cb87e51a6c6 100644
--- a/sys/arch/amiga/include/pmap.h
+++ b/sys/arch/amiga/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.31 2001/05/26 16:32:40 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.32 2001/05/26 21:27:04 chs Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -85,7 +85,7 @@ typedef struct pmap	*pmap_t;
 }
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  */
 typedef struct pv_entry {
diff --git a/sys/arch/arc/arc/bus_dma.c b/sys/arch/arc/arc/bus_dma.c
index 1074d2d75e4e..1a0ca4ed428d 100644
--- a/sys/arch/arc/arc/bus_dma.c
+++ b/sys/arch/arc/arc/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.6 2001/04/24 04:30:53 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.7 2001/05/26 21:27:04 chs Exp $	*/
 /*	NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp 	*/
 
 /*-
@@ -673,7 +673,7 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 	paddr_t high;
 {
 	paddr_t curaddr, lastaddr;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
@@ -737,7 +737,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
diff --git a/sys/arch/arm/arm32/pmap.c b/sys/arch/arm/arm32/pmap.c
index e0864966686d..659b1ba80590 100644
--- a/sys/arch/arm/arm32/pmap.c
+++ b/sys/arch/arm/arm32/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.8 2001/04/25 17:35:01 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.9 2001/05/26 21:27:04 chs Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -941,7 +941,7 @@ pmap_alloc_l1pt(void)
 	vaddr_t va;
 	struct l1pt *pt;
 	int error;
-	vm_page_t m;
+	struct vm_page *m;
 	pt_entry_t *pte;
 
 	/* Allocate virtual address space for the L1 page table */
diff --git a/sys/arch/arm/include/arm32/pmap.h b/sys/arch/arm/include/arm32/pmap.h
index 4ec3a262e8fc..4475cd4650e1 100644
--- a/sys/arch/arm/include/arm32/pmap.h
+++ b/sys/arch/arm/include/arm32/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.8 2001/05/26 16:32:40 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.9 2001/05/26 21:27:05 chs Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -72,7 +72,7 @@ struct pmap {
 typedef struct pmap *pmap_t;
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  */
 typedef struct pv_entry {
diff --git a/sys/arch/arm32/arm32/bus_dma.c b/sys/arch/arm32/arm32/bus_dma.c
index 53cc7a771a1a..55d17db627d0 100644
--- a/sys/arch/arm32/arm32/bus_dma.c
+++ b/sys/arch/arm32/arm32/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.23 2001/04/24 04:30:54 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.24 2001/05/26 21:27:05 chs Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -446,7 +446,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
@@ -749,7 +749,7 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 	vm_offset_t high;
 {
 	vm_offset_t curaddr, lastaddr;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
diff --git a/sys/arch/atari/atari/bus.c b/sys/arch/atari/atari/bus.c
index 4c98a3579278..d50e41d889f6 100644
--- a/sys/arch/atari/atari/bus.c
+++ b/sys/arch/atari/atari/bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.26 2001/04/24 04:30:54 thorpej Exp $	*/
+/*	$NetBSD: bus.c,v 1.27 2001/05/26 21:27:05 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -651,7 +651,7 @@ bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr, offset;
 	struct pglist mlist;
 	int curseg;
@@ -895,7 +895,7 @@ bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 {
 	paddr_t curaddr, lastaddr;
 	bus_addr_t offset;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
diff --git a/sys/arch/atari/atari/pmap.c b/sys/arch/atari/atari/pmap.c
index 7da82d9d29ba..1110deee8ae5 100644
--- a/sys/arch/atari/atari/pmap.c
+++ b/sys/arch/atari/atari/pmap.c
@@ -2135,7 +2135,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2152,7 +2152,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2619,7 +2619,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/atari/include/pmap.h b/sys/arch/atari/include/pmap.h
index 2f72e43c3322..75df238921eb 100644
--- a/sys/arch/atari/include/pmap.h
+++ b/sys/arch/atari/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.25 2001/05/26 16:32:41 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.26 2001/05/26 21:27:05 chs Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -98,7 +98,7 @@ struct memseg {
 };
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  */
 typedef struct pv_entry {
diff --git a/sys/arch/bebox/bebox/bus_dma.c b/sys/arch/bebox/bebox/bus_dma.c
index 9998b07c66a4..4830a758dbbf 100644
--- a/sys/arch/bebox/bebox/bus_dma.c
+++ b/sys/arch/bebox/bebox/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.33 2001/04/24 04:30:55 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.34 2001/05/26 21:27:06 chs Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -463,7 +463,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
@@ -602,7 +602,7 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 	paddr_t high;
 {
 	paddr_t curaddr, lastaddr;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
diff --git a/sys/arch/cobalt/cobalt/bus.c b/sys/arch/cobalt/cobalt/bus.c
index 1c217212c53f..a1ac1db469ce 100644
--- a/sys/arch/cobalt/cobalt/bus.c
+++ b/sys/arch/cobalt/cobalt/bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.8 2001/04/24 04:30:56 thorpej Exp $	*/
+/*	$NetBSD: bus.c,v 1.9 2001/05/26 21:27:06 chs Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -587,7 +587,7 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
 	extern paddr_t avail_start, avail_end;
 	vaddr_t curaddr, lastaddr;
 	psize_t high;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
@@ -649,7 +649,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
diff --git a/sys/arch/dreamcast/dev/g2/gapspci_dma.c b/sys/arch/dreamcast/dev/g2/gapspci_dma.c
index ee0b6a145537..6d849bc19f89 100644
--- a/sys/arch/dreamcast/dev/g2/gapspci_dma.c
+++ b/sys/arch/dreamcast/dev/g2/gapspci_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gapspci_dma.c,v 1.4 2001/04/24 04:30:56 thorpej Exp $	*/
+/*	$NetBSD: gapspci_dma.c,v 1.5 2001/05/26 21:27:06 chs Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -496,7 +496,7 @@ gaps_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
 
 	struct pglist mlist;
 	paddr_t curaddr, lastaddr;
-	vm_page_t m;
+	struct vm_page *m;
 	int curseg, error;
 
 	/* Always round the size. */
@@ -542,7 +542,7 @@ void
 gaps_dmamem_free(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs)
 {
 	struct pglist mlist;
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	int curseg;
 
diff --git a/sys/arch/dreamcast/dev/maple/maple.c b/sys/arch/dreamcast/dev/maple/maple.c
index 5a1bbde8d704..06d923a93857 100644
--- a/sys/arch/dreamcast/dev/maple/maple.c
+++ b/sys/arch/dreamcast/dev/maple/maple.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: maple.c,v 1.7 2001/05/26 19:04:39 marcus Exp $	*/
+/*	$NetBSD: maple.c,v 1.8 2001/05/26 21:27:06 chs Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -437,7 +437,7 @@ maple_alloc_dma(size, vap, pap)
 	extern paddr_t avail_start, avail_end;	/* from pmap.c */
 
 	struct pglist mlist;
-	vm_page_t m;
+	struct vm_page *m;
 	int error;
 
 	size = round_page(size);
@@ -461,7 +461,7 @@ maple_free_dma(paddr, size)
 	size_t size;
 {
 	struct pglist mlist;
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 
 	TAILQ_INIT(&mlist);
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index 083fb19b0e28..3f78b1b3657c 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.92 2001/04/24 04:30:57 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.93 2001/05/26 21:27:06 chs Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -2662,7 +2662,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2679,7 +2679,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2725,7 +2725,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/hp300/include/pmap.h b/sys/arch/hp300/include/pmap.h
index 9bcc7eb0264c..6db59f9edeba 100644
--- a/sys/arch/hp300/include/pmap.h
+++ b/sys/arch/hp300/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.30 2001/05/26 16:32:41 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.31 2001/05/26 21:27:07 chs Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -98,7 +98,7 @@ typedef struct pmap	*pmap_t;
 }
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry, the list is pv_table.
  */
 struct pv_entry {
diff --git a/sys/arch/hpcmips/hpcmips/bus_dma.c b/sys/arch/hpcmips/hpcmips/bus_dma.c
index 4b732b0bbf03..23e24f112578 100644
--- a/sys/arch/hpcmips/hpcmips/bus_dma.c
+++ b/sys/arch/hpcmips/hpcmips/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.7 2001/04/24 04:30:58 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.8 2001/05/26 21:27:07 chs Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -542,7 +542,7 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
 	extern paddr_t avail_start, avail_end;		/* XXX */
 	vaddr_t curaddr, lastaddr;
 	psize_t high;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
@@ -604,7 +604,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
diff --git a/sys/arch/i386/i386/bus_machdep.c b/sys/arch/i386/i386/bus_machdep.c
index 00aff1491145..edca27c76536 100644
--- a/sys/arch/i386/i386/bus_machdep.c
+++ b/sys/arch/i386/i386/bus_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_machdep.c,v 1.8 2001/04/25 03:31:23 thorpej Exp $	*/
+/*	$NetBSD: bus_machdep.c,v 1.9 2001/05/26 21:27:07 chs Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -737,7 +737,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
@@ -980,7 +980,7 @@ _bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
 	paddr_t high;
 {
 	paddr_t curaddr, lastaddr;
-	vm_page_t m;
+	struct vm_page *m;
 	struct pglist mlist;
 	int curseg, error;
 
diff --git a/sys/arch/luna68k/include/pmap.h b/sys/arch/luna68k/include/pmap.h
index 9608ec18d54f..0c0e990ad6b5 100644
--- a/sys/arch/luna68k/include/pmap.h
+++ b/sys/arch/luna68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.5 2001/05/26 16:32:42 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.6 2001/05/26 21:27:08 chs Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -88,7 +88,7 @@ typedef struct pmap	*pmap_t;
 }
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry, the list is pv_table.
  */
 struct pv_entry {
diff --git a/sys/arch/luna68k/luna68k/pmap.c b/sys/arch/luna68k/luna68k/pmap.c
index 63841b3fa946..69d5acd7ab33 100644
--- a/sys/arch/luna68k/luna68k/pmap.c
+++ b/sys/arch/luna68k/luna68k/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.12 2001/04/24 04:31:00 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.13 2001/05/26 21:27:08 chs Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -2379,7 +2379,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2396,7 +2396,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2458,7 +2458,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index e9058aba6043..d635d8ace999 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.31 2001/05/26 16:32:42 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.32 2001/05/26 21:27:08 chs Exp $	*/
 
 /*
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -132,7 +132,7 @@ typedef struct pmap	*pmap_t;
 }
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  */
 typedef struct pv_entry {
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 74be2763f317..40629b019e32 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.75 2001/04/24 04:31:02 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.76 2001/05/26 21:27:08 chs Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -2404,7 +2404,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	m = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2421,7 +2421,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2467,7 +2467,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t m;
+	struct vm_page *m;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/macppc/macppc/bus_dma.c b/sys/arch/macppc/macppc/bus_dma.c
index 44dd6aec8a5f..371fb73d4423 100644
--- a/sys/arch/macppc/macppc/bus_dma.c
+++ b/sys/arch/macppc/macppc/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.18 2001/04/24 04:31:02 thorpej Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.19 2001/05/26 21:27:09 chs Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -420,7 +420,7 @@ _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags)
 {
 	paddr_t avail_start, avail_end;
 	paddr_t curaddr, lastaddr, high;
-	vm_page_t m;    
+	struct vm_page *m;    
 	struct pglist mlist;
 	int curseg, error;
 
@@ -485,7 +485,7 @@ _bus_dmamem_free(t, segs, nsegs)
 	bus_dma_segment_t *segs;
 	int nsegs;
 {
-	vm_page_t m;
+	struct vm_page *m;
 	bus_addr_t addr;
 	struct pglist mlist;
 	int curseg;
diff --git a/sys/arch/mips/include/pmap.h b/sys/arch/mips/include/pmap.h
index ee9bf66f4ca1..76248d62a630 100644
--- a/sys/arch/mips/include/pmap.h
+++ b/sys/arch/mips/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.34 2001/05/26 16:32:42 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.35 2001/05/26 21:27:09 chs Exp $	*/
 
 /*
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -91,7 +91,7 @@ typedef struct pmap {
 } *pmap_t;
 
 /*
- * For each vm_page_t, there is a list of all currently valid virtual
+ * For each struct vm_page, there is a list of all currently valid virtual
  * mappings of that page.  An entry is a pv_entry_t, the list is pv_table.
  * XXX really should do this as a part of the higher level code.
  */
diff --git a/sys/arch/mips/mips/pmap.c b/sys/arch/mips/mips/pmap.c
index 52e9d77def01..eb8cb11ab7ea 100644
--- a/sys/arch/mips/mips/pmap.c
+++ b/sys/arch/mips/mips/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.125 2001/04/24 04:31:03 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.126 2001/05/26 21:27:09 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.125 2001/04/24 04:31:03 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.126 2001/05/26 21:27:09 chs Exp $");
 
 /*
  *	Manages physical address maps.
@@ -513,7 +513,7 @@ pmap_pinit(pmap)
 		splx(s);
 	} else {
 		struct segtab *stp;
-		vm_page_t mem;
+		struct vm_page *mem;
 
 		do {
 			mem = uvm_pagealloc(NULL, 0, NULL,
@@ -1108,7 +1108,7 @@ pmap_enter(pmap, va, pa, prot, flags)
 	int need_enter_pv;
 	pt_entry_t *pte;
 	u_int npte;
-	vm_page_t mem;
+	struct vm_page *mem;
 	unsigned asid;
 	boolean_t wired = (flags & PMAP_WIRED) != 0;