more typedef zapping vm_page_t -> struct vm_page *

13 files changed, 49 insertions, 49 deletions

diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 0c51e69e507..ed84ddf001d 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.28 2001/11/28 15:34:16 art Exp $ */
+/* $OpenBSD: pmap.c,v 1.29 2001/11/28 16:24:26 art Exp $ */
 /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
 
 /*-
@@ -1515,7 +1515,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;
 	struct pv_head *pvh;
@@ -2412,7 +2412,7 @@ pmap_copy_page(paddr_t src, paddr_t dst)
  *	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)
 {
 	struct pv_head *pvh;
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -2447,7 +2447,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)
 {
 	struct pv_head *pvh;
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -2483,7 +2483,7 @@ pmap_clear_reference(vm_page_t pg)
  *	by any physical maps.
  */
 boolean_t
-pmap_is_referenced(vm_page_t pg)
+pmap_is_referenced(struct vm_page *pg)
 {
 	struct pv_head *pvh;
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -2506,7 +2506,7 @@ pmap_is_referenced(vm_page_t pg)
  *	by any physical maps.
  */
 boolean_t
-pmap_is_modified(vm_page_t pg)
+pmap_is_modified(struct vm_page *pg)
 {
 	struct pv_head *pvh;
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index 1444b849247..a61c6cca9a7 100644
--- a/sys/arch/alpha/dev/bus_dma.c
+++ b/sys/arch/alpha/dev/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.6 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.7 2001/11/28 16:24:26 art Exp $ */
 /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
 
 /*-
@@ -477,7 +477,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;
 
@@ -539,7 +539,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/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index ae2ba83ece2..93b7dfc2e70 100644
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.42 2001/11/28 16:13:27 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.43 2001/11/28 16:24:26 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $	*/
 
 /*-
@@ -2066,7 +2066,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));
@@ -2083,7 +2083,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);
@@ -2529,7 +2529,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/isa/cross.c b/sys/arch/amiga/isa/cross.c
index 140b9941391..181bb08bcb8 100644
--- a/sys/arch/amiga/isa/cross.c
+++ b/sys/arch/amiga/isa/cross.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cross.c,v 1.19 2001/11/28 13:47:38 art Exp $	*/
+/*	$OpenBSD: cross.c,v 1.20 2001/11/28 16:24:26 art Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer
@@ -113,7 +113,7 @@ void	*cross_intr_establish __P((void *, int, int, int, int (*)(void *),
 void	cross_intr_disestablish __P((void *, void *));
 int	cross_intr_check __P((void *, int, int));
 
-int	cross_pager_get_pages __P((vm_pager_t, vm_page_t *, int, boolean_t));
+int	cross_pager_get_pages __P((vm_pager_t, struct vm_page **, int, boolean_t));
 
 struct cfattach cross_ca = {
 	sizeof(struct cross_softc), crossmatch, crossattach
@@ -459,7 +459,7 @@ cross_intr_disestablish(ic, arg)
 int
 cross_pager_get_pages(pager, mlist, npages, sync)
 	vm_pager_t	pager;
-	vm_page_t	*mlist;
+	struct vm_page	**mlist;
 	int		npages;
 	boolean_t	sync;
 {
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index 5b8f1becea2..18e4071f102 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.35 2001/11/28 16:13:28 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.36 2001/11/28 16:24:26 art Exp $	*/
 /*	$NetBSD: pmap.c,v 1.80 1999/09/16 14:52:06 chs Exp $	*/
 
 /*-
@@ -2561,7 +2561,7 @@ pmap_enter_ptpage(pmap, va)
 	vaddr_t va;
 {
 	paddr_t ptpa;
-	vm_page_t pg;
+	struct vm_page *pg;
 	struct pv_entry *pv;
 	st_entry_t *ste;
 	int s;
@@ -2795,7 +2795,7 @@ void
 pmap_ptpage_addref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t pg;
+	struct vm_page *pg;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
 	pg = uvm_pagelookup(uvm.kernel_object, ptpva - vm_map_min(kernel_map));
@@ -2814,7 +2814,7 @@ int
 pmap_ptpage_delref(ptpva)
 	vaddr_t ptpva;
 {
-	vm_page_t pg;
+	struct vm_page *pg;
 	int rv;
 
 	simple_lock(&uvm.kernel_object->vmobjlock);
@@ -2862,7 +2862,7 @@ pmap_check_wiring(str, va)
 {
 	pt_entry_t *pte;
 	paddr_t pa;
-	vm_page_t pg;
+	struct vm_page *pg;
 	int count;
 
 	if (!pmap_ste_v(pmap_kernel(), va) ||
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 0ee35b4bdd2..24bc97fb755 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.50 2001/11/28 14:20:16 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.51 2001/11/28 16:24:26 art Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -1142,7 +1142,7 @@ pmap_remove(pmap, sva, eva)
  */
 void
 pmap_page_protect(pg, prot)
-	vm_page_t pg;
+	struct vm_page *pg;
 	vm_prot_t prot;
 {
 	register struct pv_entry *pv;
@@ -1425,7 +1425,7 @@ pmap_copy_page(spa, dpa)
  */
 boolean_t
 pmap_clear_modify(pg)
-	vm_page_t pg;
+	struct vm_page *pg;
 {
 	register struct pv_entry *pv;
 	register paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -1458,7 +1458,7 @@ pmap_clear_modify(pg)
  */
 boolean_t
 pmap_is_modified(pg)
-	vm_page_t pg;
+	struct vm_page *pg;
 {
 	register struct pv_entry *pv;
 	register paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -1487,7 +1487,7 @@ pmap_is_modified(pg)
  */
 boolean_t
 pmap_clear_reference(pg)
-	vm_page_t pg;
+	struct vm_page *pg;
 {
 	register struct pv_entry *pv;
 	register paddr_t pa = VM_PAGE_TO_PHYS(pg);
@@ -1520,7 +1520,7 @@ pmap_clear_reference(pg)
  */
 boolean_t
 pmap_is_referenced(pg)
-	vm_page_t pg;
+	struct vm_page *pg;
 {
 	register struct pv_entry *pv;
 	register paddr_t pa = VM_PAGE_TO_PHYS(pg);
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 2c3fb637e37..9b5a28517d1 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.186 2001/11/28 16:13:28 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.187 2001/11/28 16:24:26 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -526,7 +526,7 @@ setup_buffers(maxaddr)
 	vm_offset_t addr;
 	int base, residual, left, chunk, i;
 	struct pglist pgs, saved_pgs;
-	vm_page_t pg;
+	struct vm_page *pg;
 
 	size = MAXBSIZE * nbuf;
 	if (uvm_map(kernel_map, (vaddr_t *) &buffers, round_page(size),
@@ -3043,7 +3043,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;
@@ -3274,7 +3274,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/macppc/macppc/dma.c b/sys/arch/macppc/macppc/dma.c
index 2a6eb15308b..b92c6c7e404 100644
--- a/sys/arch/macppc/macppc/dma.c
+++ b/sys/arch/macppc/macppc/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.6 2001/11/16 20:46:16 jason Exp $	*/
+/*	$OpenBSD: dma.c,v 1.7 2001/11/28 16:24:26 art Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -349,7 +349,7 @@ _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;
@@ -486,7 +486,7 @@ _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/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c
index 1bc234640da..536db5f6d8e 100644
--- a/sys/arch/mvme68k/mvme68k/pmap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.34 2001/11/28 16:13:28 art Exp $ */
+/*	$OpenBSD: pmap.c,v 1.35 2001/11/28 16:24:26 art Exp $ */
 
 /* 
  * Copyright (c) 1995 Theo de Raadt
@@ -2317,7 +2317,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));
@@ -2334,7 +2334,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);
diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c
index e7964c0faf7..b5c644a7116 100644
--- a/sys/arch/vax/vax/bus_dma.c
+++ b/sys/arch/vax/vax/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.6 2001/11/06 02:49:23 art Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.7 2001/11/28 16:24:26 art Exp $	*/
 /*	$NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $	*/
 
 /*-
@@ -394,7 +394,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;
@@ -687,7 +687,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/kern/vnode_if.c b/sys/kern/vnode_if.c
index 57408885222..5c119a381b4 100644
--- a/sys/kern/vnode_if.c
+++ b/sys/kern/vnode_if.c
@@ -1282,7 +1282,7 @@ struct vnodeop_desc vop_getpages_desc = {
 int VOP_GETPAGES(vp, offset, m, count, centeridx, access_type, advice, flags)
 	struct vnode *vp;
 	voff_t offset;
-	vm_page_t *m;
+	struct vm_page **m;
 	int *count;
 	int centeridx;
 	vm_prot_t access_type;
@@ -1320,7 +1320,7 @@ struct vnodeop_desc vop_putpages_desc = {
 
 int VOP_PUTPAGES(vp, m, count, flags, rtvals)
 	struct vnode *vp;
-	vm_page_t *m;
+	struct vm_page **m;
 	int count;
 	int flags;
 	int *rtvals;
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 1af0f56e276..87b37e82a1d 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -1,4 +1,4 @@
-#	$OpenBSD: vnode_if.src,v 1.14 2001/11/27 05:27:12 art Exp $
+#	$OpenBSD: vnode_if.src,v 1.15 2001/11/28 16:24:26 art Exp $
 #	$NetBSD: vnode_if.src,v 1.10 1996/05/11 18:26:27 mycroft Exp $
 #
 # Copyright (c) 1992, 1993
@@ -485,7 +485,7 @@ vop_ballocn {
 vop_getpages {
 	IN struct vnode *vp;
 	IN voff_t offset;
-	IN vm_page_t *m;
+	IN struct vm_page **m;
 	IN int *count;
 	IN int centeridx;
 	IN vm_prot_t access_type;
@@ -498,7 +498,7 @@ vop_getpages {
 #
 vop_putpages {
 	IN struct vnode *vp;
-	IN vm_page_t *m;
+	IN struct vm_page **m;
 	IN int count;
 	IN int flags;
 	IN int *rtvals;
diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h
index de6869fcffd..754651ca779 100644
--- a/sys/sys/vnode_if.h
+++ b/sys/sys/vnode_if.h
@@ -412,7 +412,7 @@ struct vop_getpages_args {
 	struct vnodeop_desc *a_desc;
 	struct vnode *a_vp;
 	voff_t a_offset;
-	vm_page_t *a_m;
+	struct vm_page **a_m;
 	int *a_count;
 	int a_centeridx;
 	vm_prot_t a_access_type;
@@ -420,19 +420,19 @@ struct vop_getpages_args {
 	int a_flags;
 };
 extern struct vnodeop_desc vop_getpages_desc;
-int VOP_GETPAGES __P((struct vnode *, voff_t, vm_page_t *, int *, int, 
+int VOP_GETPAGES __P((struct vnode *, voff_t, struct vm_page **, int *, int, 
     vm_prot_t, int, int));
 
 struct vop_putpages_args {
 	struct vnodeop_desc *a_desc;
 	struct vnode *a_vp;
-	vm_page_t *a_m;
+	struct vm_page **a_m;
 	int a_count;
 	int a_flags;
 	int *a_rtvals;
 };
 extern struct vnodeop_desc vop_putpages_desc;
-int VOP_PUTPAGES __P((struct vnode *, vm_page_t *, int, int, int *));
+int VOP_PUTPAGES __P((struct vnode *, struct vm_page **, int, int, int *));
 
 struct vop_size_args {
 	struct vnodeop_desc *a_desc;