From 57e43348f35babd0ddee92a5473d6974ce8598bb Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Tue, 23 Mar 2004 22:54:32 +0000
Subject: [PATCH] ANSIfication (procedure args) cleanup.

Submitted-by: Andre Nathan <andre@digirati.com.br>
---
 sys/vm/default_pager.c | 27 +++---------
 sys/vm/device_pager.c  | 34 +++++----------
 sys/vm/swap_pager.c    | 60 ++++++++------------------
 sys/vm/vm_fault.c      | 29 ++++---------
 sys/vm/vm_glue.c       | 37 +++++-----------
 sys/vm/vm_init.c       |  5 +--
 sys/vm/vm_kern.c       | 14 ++----
 sys/vm/vm_map.c        | 41 ++++++------------
 sys/vm/vm_mmap.c       |  5 +--
 sys/vm/vm_object.c     | 96 +++++++++++++-----------------------------
 sys/vm/vm_pageout.c    | 34 ++++++---------
 sys/vm/vm_pager.c      | 62 ++++++++-------------------
 sys/vm/vm_swap.c       | 11 +++--
 sys/vm/vnode_pager.c   | 64 ++++++++--------------------
 14 files changed, 156 insertions(+), 363 deletions(-)

diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 0a8c67537a..449141b0f5 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -37,7 +37,7 @@
  * is maintained whenever a resident page also has swap backing store.
  *
  * $FreeBSD: src/sys/vm/default_pager.c,v 1.23 1999/11/07 20:03:53 alc Exp $
- * $DragonFly: src/sys/vm/default_pager.c,v 1.3 2003/08/20 08:03:01 rob Exp $
+ * $DragonFly: src/sys/vm/default_pager.c,v 1.4 2004/03/23 22:54:32 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -92,8 +92,7 @@ default_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
  */
 
 static void
-default_pager_dealloc(object)
-	vm_object_t object;
+default_pager_dealloc(vm_object_t object)
 {
 	/*
 	 * OBJT_DEFAULT objects have no special resources allocated to them.
@@ -107,11 +106,7 @@ default_pager_dealloc(object)
  */
 
 static int
-default_pager_getpages(object, m, count, reqpage)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	int reqpage;
+default_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 {
 	return VM_PAGER_FAIL;
 }
@@ -124,12 +119,8 @@ default_pager_getpages(object, m, count, reqpage)
  */
 
 static void
-default_pager_putpages(object, m, c, sync, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int c;
-	boolean_t sync;
-	int *rtvals;
+default_pager_putpages(vm_object_t object, vm_page_t *m, int c, boolean_t sync,
+    int *rtvals)
 {
 	swap_pager_putpages(object, m, c, sync, rtvals);
 }
@@ -148,12 +139,8 @@ default_pager_putpages(object, m, c, sync, rtvals)
  */
 
 static boolean_t
-default_pager_haspage(object, pindex, before, after)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int *before;
-	int *after;
+default_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+    int *after)
 {
 	return FALSE;
 }
-
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 411accc5a4..d4aaa6d38d 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -37,7 +37,7 @@
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/vm/device_pager.c,v 1.46.2.1 2000/08/02 21:54:37 peter Exp $
- * $DragonFly: src/sys/vm/device_pager.c,v 1.6 2003/11/03 17:11:23 dillon Exp $
+ * $DragonFly: src/sys/vm/device_pager.c,v 1.7 2004/03/23 22:54:32 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ struct pagerops devicepagerops = {
 };
 
 static void
-dev_pager_init()
+dev_pager_init(void)
 {
 	TAILQ_INIT(&dev_pager_object_list);
 	fakepg_zone = &fakepg_zone_store;
@@ -164,8 +164,7 @@ dev_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot, vm_ooffset_t fo
 }
 
 static void
-dev_pager_dealloc(object)
-	vm_object_t object;
+dev_pager_dealloc(vm_object_t object)
 {
 	vm_page_t m;
 
@@ -180,11 +179,7 @@ dev_pager_dealloc(object)
 }
 
 static int
-dev_pager_getpages(object, m, count, reqpage)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	int reqpage;
+dev_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 {
 	vm_offset_t offset;
 	vm_paddr_t paddr;
@@ -216,22 +211,15 @@ dev_pager_getpages(object, m, count, reqpage)
 }
 
 static void
-dev_pager_putpages(object, m, count, sync, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	boolean_t sync;
-	int *rtvals;
+dev_pager_putpages(vm_object_t object, vm_page_t *m, int count, boolean_t sync,
+    int *rtvals)
 {
 	panic("dev_pager_putpage called");
 }
 
 static boolean_t
-dev_pager_haspage(object, pindex, before, after)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int *before;
-	int *after;
+dev_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+    int *after)
 {
 	if (before != NULL)
 		*before = 0;
@@ -241,8 +229,7 @@ dev_pager_haspage(object, pindex, before, after)
 }
 
 static vm_page_t
-dev_pager_getfake(paddr)
-	vm_paddr_t paddr;
+dev_pager_getfake(vm_paddr_t paddr)
 {
 	vm_page_t m;
 
@@ -263,8 +250,7 @@ dev_pager_getfake(paddr)
 }
 
 static void
-dev_pager_putfake(m)
-	vm_page_t m;
+dev_pager_putfake(vm_page_t m)
 {
 	if (!(m->flags & PG_FICTITIOUS))
 		panic("dev_pager_putfake: bad page");
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index e3a419ef3a..a5e53f12d7 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -65,7 +65,7 @@
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
  *
  * $FreeBSD: src/sys/vm/swap_pager.c,v 1.130.2.12 2002/08/31 21:15:55 dillon Exp $
- * $DragonFly: src/sys/vm/swap_pager.c,v 1.10 2003/08/20 08:03:01 rob Exp $
+ * $DragonFly: src/sys/vm/swap_pager.c,v 1.11 2004/03/23 22:54:32 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -217,7 +217,7 @@ static daddr_t swp_pager_meta_ctl (vm_object_t, vm_pindex_t, int);
  */
 
 static __inline void
-swp_sizecheck()
+swp_sizecheck(void)
 {
 	if (vm_swap_size < nswap_lowat) {
 		if (swap_pager_almost_full == 0) {
@@ -240,7 +240,7 @@ swp_sizecheck()
  */
 
 static void
-swap_pager_init()
+swap_pager_init(void)
 {
 	/*
 	 * Initialize object lists
@@ -267,7 +267,7 @@ swap_pager_init()
  */
 
 void
-swap_pager_swap_init()
+swap_pager_swap_init(void)
 {
 	int n, n2;
 
@@ -429,8 +429,7 @@ swap_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
  */
 
 static void
-swap_pager_dealloc(object)
-	vm_object_t object;
+swap_pager_dealloc(vm_object_t object)
 {
 	int s;
 
@@ -480,8 +479,7 @@ swap_pager_dealloc(object)
  */
 
 static __inline daddr_t
-swp_pager_getswapspace(npages)
-	int npages;
+swp_pager_getswapspace(int npages)
 {
 	daddr_t blk;
 
@@ -514,9 +512,7 @@ swp_pager_getswapspace(npages)
  */
 
 static __inline void
-swp_pager_freeswapspace(blk, npages)
-	daddr_t blk;
-	int npages;
+swp_pager_freeswapspace(daddr_t blk, int npages)
 {
 	blist_free(swapblist, blk, npages);
 	vm_swap_size += npages;
@@ -540,10 +536,7 @@ swp_pager_freeswapspace(blk, npages)
  */
 
 void
-swap_pager_freespace(object, start, size)
-	vm_object_t object;
-	vm_pindex_t start;
-	vm_size_t size;
+swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size)
 {
 	int s = splvm();
 	swp_pager_meta_free(object, start, size);
@@ -619,11 +612,8 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_size_t size)
  */
 
 void
-swap_pager_copy(srcobject, dstobject, offset, destroysource)
-	vm_object_t srcobject;
-	vm_object_t dstobject;
-	vm_pindex_t offset;
-	int destroysource;
+swap_pager_copy(vm_object_t srcobject, vm_object_t dstobject,
+    vm_pindex_t offset, int destroysource)
 {
 	vm_pindex_t i;
 	int s;
@@ -727,11 +717,8 @@ swap_pager_copy(srcobject, dstobject, offset, destroysource)
  */
 
 boolean_t
-swap_pager_haspage(object, pindex, before, after)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int *before;
-	int *after;
+swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+    int *after)
 {
 	daddr_t blk0;
 	int s;
@@ -811,8 +798,7 @@ swap_pager_haspage(object, pindex, before, after)
  */
 
 static void
-swap_pager_unswapped(m)
-	vm_page_t m;
+swap_pager_unswapped(vm_page_t m)
 {
 	swp_pager_meta_ctl(m->object, m->pindex, SWM_FREE);
 }
@@ -1013,10 +999,7 @@ swap_pager_strategy(vm_object_t object, struct buf *bp)
  */
 
 static int
-swap_pager_getpages(object, m, count, reqpage)
-	vm_object_t object;
-	vm_page_t *m;
-	int count, reqpage;
+swap_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 {
 	struct buf *bp;
 	vm_page_t mreq;
@@ -1222,12 +1205,8 @@ swap_pager_getpages(object, m, count, reqpage)
  */
 
 void
-swap_pager_putpages(object, m, count, sync, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	boolean_t sync;
-	int *rtvals;
+swap_pager_putpages(vm_object_t object, vm_page_t *m, int count, boolean_t sync,
+    int *rtvals)
 {
 	int i;
 	int n = 0;
@@ -1452,8 +1431,7 @@ swap_pager_putpages(object, m, count, sync, rtvals)
  */
 
 static void
-swp_pager_sync_iodone(bp)
-	struct buf *bp;
+swp_pager_sync_iodone(struct buf *bp)
 {
 	bp->b_flags |= B_DONE;
 	bp->b_flags &= ~B_ASYNC;
@@ -1480,8 +1458,7 @@ swp_pager_sync_iodone(bp)
  */
 
 static void
-swp_pager_async_iodone(bp)
-	struct buf *bp;
+swp_pager_async_iodone(struct buf *bp)
 {
 	int s;
 	int i;
@@ -1966,4 +1943,3 @@ swp_pager_meta_ctl(
 	}
 	return(r1);
 }
-
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index f6382fe31d..d400dd3042 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -67,7 +67,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_fault.c,v 1.108.2.8 2002/02/26 05:49:27 silby Exp $
- * $DragonFly: src/sys/vm/vm_fault.c,v 1.11 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_fault.c,v 1.12 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -890,9 +890,7 @@ readrest:
  *	Wire down a range of virtual addresses in a map.
  */
 int
-vm_fault_wire(map, start, end)
-	vm_map_t map;
-	vm_offset_t start, end;
+vm_fault_wire(vm_map_t map, vm_offset_t start, vm_offset_t end)
 {
 
 	vm_offset_t va;
@@ -933,9 +931,7 @@ vm_fault_wire(map, start, end)
  *	on currently read only sections.
  */
 int
-vm_fault_user_wire(map, start, end)
-	vm_map_t map;
-	vm_offset_t start, end;
+vm_fault_user_wire(vm_map_t map, vm_offset_t start, vm_offset_t end)
 {
 
 	vm_offset_t va;
@@ -973,9 +969,7 @@ vm_fault_user_wire(map, start, end)
  *	Unwire a range of virtual addresses in a map.
  */
 void
-vm_fault_unwire(map, start, end)
-	vm_map_t map;
-	vm_offset_t start, end;
+vm_fault_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end)
 {
 
 	vm_offset_t va;
@@ -1019,11 +1013,8 @@ vm_fault_unwire(map, start, end)
  */
 
 void
-vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry)
-	vm_map_t dst_map;
-	vm_map_t src_map;
-	vm_map_entry_t dst_entry;
-	vm_map_entry_t src_entry;
+vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map,
+    vm_map_entry_t dst_entry, vm_map_entry_t src_entry)
 {
 	vm_object_t dst_object;
 	vm_object_t src_object;
@@ -1117,12 +1108,8 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry)
  *  number of pages in marray
  */
 static int
-vm_fault_additional_pages(m, rbehind, rahead, marray, reqpage)
-	vm_page_t m;
-	int rbehind;
-	int rahead;
-	vm_page_t *marray;
-	int *reqpage;
+vm_fault_additional_pages(vm_page_t m, int rbehind, int rahead,
+    vm_page_t *marray, int *reqpage)
 {
 	int i,j;
 	vm_object_t object;
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 145397e70e..212108a798 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -60,7 +60,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_glue.c,v 1.94.2.4 2003/01/13 22:51:17 dillon Exp $
- * $DragonFly: src/sys/vm/vm_glue.c,v 1.20 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_glue.c,v 1.21 2004/03/23 22:54:32 dillon Exp $
  */
 
 #include "opt_vm.h"
@@ -113,9 +113,7 @@ SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL)
 static void swapout (struct proc *);
 
 int
-kernacc(addr, len, rw)
-	caddr_t addr;
-	int len, rw;
+kernacc(caddr_t addr, int len, int rw)
 {
 	boolean_t rv;
 	vm_offset_t saddr, eaddr;
@@ -133,9 +131,7 @@ kernacc(addr, len, rw)
 }
 
 int
-useracc(addr, len, rw)
-	caddr_t addr;
-	int len, rw;
+useracc(caddr_t addr, int len, int rw)
 {
 	boolean_t rv;
 	vm_prot_t prot;
@@ -174,18 +170,14 @@ useracc(addr, len, rw)
 }
 
 void
-vslock(addr, len)
-	caddr_t addr;
-	u_int len;
+vslock(caddr_t addr, u_int len)
 {
 	vm_map_wire(&curproc->p_vmspace->vm_map, trunc_page((vm_offset_t)addr),
 	    round_page((vm_offset_t)addr + len), 0);
 }
 
 void
-vsunlock(addr, len)
-	caddr_t addr;
-	u_int len;
+vsunlock(caddr_t addr, u_int len)
 {
 	vm_map_wire(&curproc->p_vmspace->vm_map, trunc_page((vm_offset_t)addr),
 	    round_page((vm_offset_t)addr + len), KM_PAGEABLE);
@@ -200,9 +192,7 @@ vsunlock(addr, len)
  * to user mode to avoid stack copying and relocation problems.
  */
 void
-vm_fork(p1, p2, flags)
-	struct proc *p1, *p2;
-	int flags;
+vm_fork(struct proc *p1, struct proc *p2, int flags)
 {
 	struct user *up;
 	struct thread *td2;
@@ -297,8 +287,7 @@ vm_waitproc(struct proc *p)
  * XXX should probably act directly on proc0.
  */
 static void
-vm_init_limits(udata)
-	void *udata;
+vm_init_limits(void *udata)
 {
 	struct proc *p = udata;
 	int rss_limit;
@@ -321,8 +310,7 @@ vm_init_limits(udata)
 }
 
 void
-faultin(p)
-	struct proc *p;
+faultin(struct proc *p)
 {
 	int s;
 
@@ -356,8 +344,7 @@ faultin(p)
  */
 /* ARGSUSED*/
 static void
-scheduler(dummy)
-	void *dummy;
+scheduler(void *dummy)
 {
 	struct proc *p;
 	int pri;
@@ -442,8 +429,7 @@ SYSCTL_INT(_vm, OID_AUTO, swap_idle_threshold2,
  * if any, otherwise the longest-resident process.
  */
 void
-swapout_procs(action)
-int action;
+swapout_procs(int action)
 {
 	struct proc *p;
 	struct proc *outp, *outp2;
@@ -531,8 +517,7 @@ retry:
 }
 
 static void
-swapout(p)
-	struct proc *p;
+swapout(struct proc *p)
 {
 
 #if defined(SWAP_DEBUG)
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index d52a4b9ff9..8c58743cac 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_init.c,v 1.20 1999/10/29 18:09:29 phk Exp $
- * $DragonFly: src/sys/vm/vm_init.c,v 1.5 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_init.c,v 1.6 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -97,8 +97,7 @@ SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL)
 
 /* ARGSUSED*/
 static void
-vm_mem_init(dummy)
-	void *dummy;
+vm_mem_init(void *dummy)
 {
 	/*
 	 * Initializes resident memory structures. From here on, all physical
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 470a863200..a6fc197349 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_kern.c,v 1.61.2.2 2002/03/12 18:25:26 tegge Exp $
- * $DragonFly: src/sys/vm/vm_kern.c,v 1.15 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_kern.c,v 1.16 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -250,10 +250,8 @@ kmem_free(vm_map_t map, vm_offset_t addr, vm_size_t size)
  *	pageable	Can the region be paged
  */
 vm_map_t
-kmem_suballoc(parent, min, max, size)
-	vm_map_t parent;
-	vm_offset_t *min, *max;
-	vm_size_t size;
+kmem_suballoc(vm_map_t parent, vm_offset_t *min, vm_offset_t *max,
+    vm_size_t size)
 {
 	int ret;
 	vm_map_t result;
@@ -492,10 +490,7 @@ kmem_alloc_wait(vm_map_t map, vm_size_t size)
  *	waiting for memory in that map.
  */
 void
-kmem_free_wakeup(map, addr, size)
-	vm_map_t map;
-	vm_offset_t addr;
-	vm_size_t size;
+kmem_free_wakeup(vm_map_t map, vm_offset_t addr, vm_size_t size)
 {
 	int count;
 
@@ -535,4 +530,3 @@ kmem_init(vm_offset_t start, vm_offset_t end)
 	vm_map_unlock(m);
 	vm_map_entry_release(count);
 }
-
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 1f3ced6c86..a1652cd315 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_map.c,v 1.187.2.19 2003/05/27 00:47:02 alc Exp $
- * $DragonFly: src/sys/vm/vm_map.c,v 1.23 2004/03/12 23:09:37 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_map.c,v 1.24 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -152,7 +152,7 @@ static void vm_map_split (vm_map_entry_t);
 static void vm_map_unclip_range (vm_map_t map, vm_map_entry_t start_entry, vm_offset_t start, vm_offset_t end, int *count, int flags);
 
 void
-vm_map_startup()
+vm_map_startup(void)
 {
 	mapzone = &mapzone_store;
 	zbootinit(mapzone, "MAP", sizeof (struct vm_map),
@@ -168,8 +168,7 @@ vm_map_startup()
  * The remaining fields must be initialized by the caller.
  */
 struct vmspace *
-vmspace_alloc(min, max)
-	vm_offset_t min, max;
+vmspace_alloc(vm_offset_t min, vm_offset_t max)
 {
 	struct vmspace *vm;
 
@@ -547,10 +546,8 @@ vm_map_entry_unlink(vm_map_t map,
  *	actually contained in the map.
  */
 boolean_t
-vm_map_lookup_entry(map, address, entry)
-	vm_map_t map;
-	vm_offset_t address;
-	vm_map_entry_t *entry;	/* OUT */
+vm_map_lookup_entry(vm_map_t map, vm_offset_t address,
+    vm_map_entry_t *entry /* OUT */)
 {
 	vm_map_entry_t cur;
 	vm_map_entry_t last;
@@ -1681,11 +1678,8 @@ vm_map_inherit(vm_map_t map, vm_offset_t start, vm_offset_t end,
  * Implement the semantics of mlock
  */
 int
-vm_map_unwire(map, start, real_end, new_pageable)
-	vm_map_t map;
-	vm_offset_t start;
-	vm_offset_t real_end;
-	boolean_t new_pageable;
+vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t real_end,
+    boolean_t new_pageable)
 {
 	vm_map_entry_t entry;
 	vm_map_entry_t start_entry;
@@ -2110,12 +2104,8 @@ vm_map_set_wired_quick(vm_map_t map, vm_offset_t addr, vm_size_t size, int *coun
  * Returns an error if any part of the specified range is not mapped.
  */
 int
-vm_map_clean(map, start, end, syncio, invalidate)
-	vm_map_t map;
-	vm_offset_t start;
-	vm_offset_t end;
-	boolean_t syncio;
-	boolean_t invalidate;
+vm_map_clean(vm_map_t map, vm_offset_t start, vm_offset_t end, boolean_t syncio,
+    boolean_t invalidate)
 {
 	vm_map_entry_t current;
 	vm_map_entry_t entry;
@@ -3273,13 +3263,8 @@ vm_map_lookup_done(vm_map_t map, vm_map_entry_t entry, int count)
  * operations.
  */
 int
-vm_uiomove(mapa, srcobject, cp, cnta, uaddra, npages)
-	vm_map_t mapa;
-	vm_object_t srcobject;
-	off_t cp;
-	int cnta;
-	vm_offset_t uaddra;
-	int *npages;
+vm_uiomove(vm_map_t mapa, vm_object_t srcobject, off_t cp, int cnta,
+    vm_offset_t uaddra, int *npages)
 {
 	vm_map_t map;
 	vm_object_t first_object, oldobject, object;
@@ -3512,9 +3497,7 @@ vm_uiomove(mapa, srcobject, cp, cnta, uaddra, npages)
  * from other processes, file unlinking, and file size shrinkage.
  */
 void
-vm_freeze_copyopts(object, froma, toa)
-	vm_object_t object;
-	vm_pindex_t froma, toa;
+vm_freeze_copyopts(vm_object_t object, vm_pindex_t froma, vm_pindex_t toa)
 {
 	int rv;
 	vm_object_t robject;
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 5de293f870..b6bfc42364 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -39,7 +39,7 @@
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
  * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.108.2.6 2002/07/02 20:06:19 dillon Exp $
- * $DragonFly: src/sys/vm/vm_mmap.c,v 1.18 2004/02/23 11:54:03 eirikn Exp $
+ * $DragonFly: src/sys/vm/vm_mmap.c,v 1.19 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -95,8 +95,7 @@ static void vmmapentry_rsrc_init (void *);
 SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init, NULL)
 
 static void
-vmmapentry_rsrc_init(dummy)
-        void *dummy;
+vmmapentry_rsrc_init(void *dummy)
 {
     max_proc_mmap = (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) /
 			sizeof(struct vm_map_entry);
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 911675fa79..417f0b3ea3 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_object.c,v 1.171.2.8 2003/05/26 19:17:56 alc Exp $
- * $DragonFly: src/sys/vm/vm_object.c,v 1.13 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_object.c,v 1.14 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -149,10 +149,7 @@ static int object_hash_rand;
 static struct vm_object vm_objects_init[VM_OBJECTS_INIT];
 
 void
-_vm_object_allocate(type, size, object)
-	objtype_t type;
-	vm_size_t size;
-	vm_object_t object;
+_vm_object_allocate(objtype_t type, vm_size_t size, vm_object_t object)
 {
 	int incr;
 	TAILQ_INIT(&object->memq);
@@ -197,7 +194,7 @@ _vm_object_allocate(type, size, object)
  *	Initialize the VM objects module.
  */
 void
-vm_object_init()
+vm_object_init(void)
 {
 	TAILQ_INIT(&vm_object_list);
 	lwkt_token_init(&vm_object_list_token);
@@ -217,7 +214,7 @@ vm_object_init()
 }
 
 void
-vm_object_init2() 
+vm_object_init2(void)
 {
 	zinitna(obj_zone, NULL, NULL, 0, 0, ZONE_PANICFAIL, 1);
 }
@@ -229,9 +226,7 @@ vm_object_init2()
  */
 
 vm_object_t
-vm_object_allocate(type, size)
-	objtype_t type;
-	vm_size_t size;
+vm_object_allocate(objtype_t type, vm_size_t size)
 {
 	vm_object_t result;
 
@@ -249,8 +244,7 @@ vm_object_allocate(type, size)
  *	Gets another reference to the given object.
  */
 void
-vm_object_reference(object)
-	vm_object_t object;
+vm_object_reference(vm_object_t object)
 {
 	if (object == NULL)
 		return;
@@ -271,8 +265,7 @@ vm_object_reference(object)
 }
 
 void
-vm_object_vndeallocate(object)
-	vm_object_t object;
+vm_object_vndeallocate(vm_object_t object)
 {
 	struct vnode *vp = (struct vnode *) object->handle;
 
@@ -306,8 +299,7 @@ vm_object_vndeallocate(object)
  *	No object may be locked.
  */
 void
-vm_object_deallocate(object)
-	vm_object_t object;
+vm_object_deallocate(vm_object_t object)
 {
 	vm_object_t temp;
 
@@ -410,8 +402,7 @@ doterm:
  *	This routine may block.
  */
 void
-vm_object_terminate(object)
-	vm_object_t object;
+vm_object_terminate(vm_object_t object)
 {
 	lwkt_tokref ilock;
 	vm_page_t p;
@@ -517,11 +508,8 @@ vm_object_terminate(object)
  */
 
 void
-vm_object_page_clean(object, start, end, flags)
-	vm_object_t object;
-	vm_pindex_t start;
-	vm_pindex_t end;
-	int flags;
+vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end,
+    int flags)
 {
 	vm_page_t p, np;
 	vm_offset_t tstart, tend;
@@ -835,8 +823,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
  *	The object must be locked.
  */
 static void
-vm_object_deactivate_pages(object)
-	vm_object_t object;
+vm_object_deactivate_pages(vm_object_t object)
 {
 	vm_page_t p, next;
 
@@ -860,10 +847,7 @@ vm_object_deactivate_pages(object)
  */
 
 void
-vm_object_pmap_copy_1(object, start, end)
-	vm_object_t object;
-	vm_pindex_t start;
-	vm_pindex_t end;
+vm_object_pmap_copy_1(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
 {
 	vm_pindex_t idx;
 	vm_page_t p;
@@ -888,10 +872,7 @@ vm_object_pmap_copy_1(object, start, end)
  *	The object must *not* be locked.
  */
 void
-vm_object_pmap_remove(object, start, end)
-	vm_object_t object;
-	vm_pindex_t start;
-	vm_pindex_t end;
+vm_object_pmap_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end)
 {
 	vm_page_t p;
 
@@ -929,11 +910,7 @@ vm_object_pmap_remove(object, start, end)
  *	    without I/O.
  */
 void
-vm_object_madvise(object, pindex, count, advise)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int count;
-	int advise;
+vm_object_madvise(vm_object_t object, vm_pindex_t pindex, int count, int advise)
 {
 	vm_pindex_t end, tpindex;
 	vm_object_t tobject;
@@ -1044,10 +1021,9 @@ shadowlookup:
  */
 
 void
-vm_object_shadow(object, offset, length)
-	vm_object_t *object;	/* IN/OUT */
-	vm_ooffset_t *offset;	/* IN/OUT */
-	vm_size_t length;
+vm_object_shadow(vm_object_t *object,	/* IN/OUT */
+		 vm_ooffset_t *offset,	/* IN/OUT */
+		 vm_size_t length)
 {
 	vm_object_t source;
 	vm_object_t result;
@@ -1306,8 +1282,7 @@ vm_object_backing_scan(vm_object_t object, int op)
  * operation, but should plug 99.9% of the rest of the leaks.
  */
 static void
-vm_object_qcollapse(object)
-	vm_object_t object;
+vm_object_qcollapse(vm_object_t object)
 {
 	vm_object_t backing_object = object->backing_object;
 
@@ -1329,8 +1304,7 @@ vm_object_qcollapse(object)
  *	parent, and the backing object is deallocated.
  */
 void
-vm_object_collapse(object)
-	vm_object_t object;
+vm_object_collapse(vm_object_t object)
 {
 	while (TRUE) {
 		vm_object_t backing_object;
@@ -1523,11 +1497,8 @@ vm_object_collapse(object)
  *	The object must be locked.
  */
 void
-vm_object_page_remove(object, start, end, clean_only)
-	vm_object_t object;
-	vm_pindex_t start;
-	vm_pindex_t end;
-	boolean_t clean_only;
+vm_object_page_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end,
+    boolean_t clean_only)
 {
 	vm_page_t p, next;
 	unsigned int size;
@@ -1642,10 +1613,8 @@ again:
  *	The object must *not* be locked.
  */
 boolean_t
-vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size)
-	vm_object_t prev_object;
-	vm_pindex_t prev_pindex;
-	vm_size_t prev_size, next_size;
+vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex,
+    vm_size_t prev_size, vm_size_t next_size)
 {
 	vm_pindex_t next_pindex;
 
@@ -1736,10 +1705,7 @@ static int	_vm_object_in_map (vm_map_t map, vm_object_t object,
 static int	vm_object_in_map (vm_object_t object);
 
 static int
-_vm_object_in_map(map, object, entry)
-	vm_map_t map;
-	vm_object_t object;
-	vm_map_entry_t entry;
+_vm_object_in_map(vm_map_t map, vm_object_t object, vm_map_entry_t entry)
 {
 	vm_map_t tmpm;
 	vm_map_entry_t tmpe;
@@ -1778,8 +1744,7 @@ _vm_object_in_map(map, object, entry)
 }
 
 static int
-vm_object_in_map( object)
-	vm_object_t object;
+vm_object_in_map(vm_object_t object)
 {
 	struct proc *p;
 	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
@@ -1888,11 +1853,10 @@ DB_SHOW_COMMAND(object, vm_object_print_static)
 
 /* XXX need this non-static entry for calling from vm_map_print. */
 void
-vm_object_print(addr, have_addr, count, modif)
-        /* db_expr_t */ long addr;
-	boolean_t have_addr;
-	/* db_expr_t */ long count;
-	char *modif;
+vm_object_print(/* db_expr_t */ long addr,
+		boolean_t have_addr,
+		/* db_expr_t */ long count,
+		char *modif)
 {
 	vm_object_print_static(addr, have_addr, count, modif);
 }
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index ccf6a3852d..6591f1cc34 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -66,7 +66,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.151.2.15 2002/12/29 18:21:04 dillon Exp $
- * $DragonFly: src/sys/vm/vm_pageout.c,v 1.9 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_pageout.c,v 1.10 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -217,8 +217,7 @@ static void vm_pageout_page_stats(void);
  */
 
 static int
-vm_pageout_clean(m)
-	vm_page_t m;
+vm_pageout_clean(vm_page_t m)
 {
 	vm_object_t object;
 	vm_page_t mc[2*vm_pageout_page_count];
@@ -355,10 +354,7 @@ more:
  */
 
 int
-vm_pageout_flush(mc, count, flags)
-	vm_page_t *mc;
-	int count;
-	int flags;
+vm_pageout_flush(vm_page_t *mc, int count, int flags)
 {
 	vm_object_t object;
 	int pageout_status[count];
@@ -446,11 +442,8 @@ vm_pageout_flush(mc, count, flags)
  *	The object and map must be locked.
  */
 static void
-vm_pageout_object_deactivate_pages(map, object, desired, map_remove_only)
-	vm_map_t map;
-	vm_object_t object;
-	vm_pindex_t desired;
-	int map_remove_only;
+vm_pageout_object_deactivate_pages(vm_map_t map, vm_object_t object,
+    vm_pindex_t desired, int map_remove_only)
 {
 	vm_page_t p, next;
 	int rcount;
@@ -538,9 +531,7 @@ vm_pageout_object_deactivate_pages(map, object, desired, map_remove_only)
  * that is really hard to do.
  */
 static void
-vm_pageout_map_deactivate_pages(map, desired)
-	vm_map_t map;
-	vm_pindex_t desired;
+vm_pageout_map_deactivate_pages(vm_map_t map, vm_pindex_t desired)
 {
 	vm_map_entry_t tmpe;
 	vm_object_t obj, bigobj;
@@ -1177,7 +1168,7 @@ rescan0:
  * helps the situation where paging just starts to occur.
  */
 static void
-vm_pageout_page_stats()
+vm_pageout_page_stats(void)
 {
 	int s;
 	vm_page_t m,next;
@@ -1271,8 +1262,7 @@ vm_pageout_page_stats()
 }
 
 static int
-vm_pageout_free_page_calc(count)
-vm_size_t count;
+vm_pageout_free_page_calc(vm_size_t count)
 {
 	if (count < vmstats.v_page_count)
 		 return 0;
@@ -1299,7 +1289,7 @@ vm_size_t count;
  *	vm_pageout is the high level pageout daemon.
  */
 static void
-vm_pageout()
+vm_pageout(void)
 {
 	int pass;
 
@@ -1419,7 +1409,7 @@ vm_pageout()
 }
 
 void
-pagedaemon_wakeup()
+pagedaemon_wakeup(void)
 {
 	if (!vm_pages_needed && curthread != pagethread) {
 		vm_pages_needed++;
@@ -1429,7 +1419,7 @@ pagedaemon_wakeup()
 
 #if !defined(NO_SWAPPING)
 static void
-vm_req_vmdaemon()
+vm_req_vmdaemon(void)
 {
 	static int lastrun = 0;
 
@@ -1440,7 +1430,7 @@ vm_req_vmdaemon()
 }
 
 static void
-vm_daemon()
+vm_daemon(void)
 {
 	struct proc *p;
 
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index c0d59546ec..a730467d38 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -62,7 +62,7 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_pager.c,v 1.54.2.2 2001/11/18 07:11:00 dillon Exp $
- * $DragonFly: src/sys/vm/vm_pager.c,v 1.8 2003/08/20 08:03:01 rob Exp $
+ * $DragonFly: src/sys/vm/vm_pager.c,v 1.9 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -106,32 +106,21 @@ static boolean_t dead_pager_haspage (vm_object_t, vm_pindex_t, int *, int *);
 static void dead_pager_dealloc (vm_object_t);
 
 static int
-dead_pager_getpages(obj, ma, count, req)
-	vm_object_t obj;
-	vm_page_t *ma;
-	int count;
-	int req;
+dead_pager_getpages(vm_object_t obj, vm_page_t *ma, int count, int req)
 {
 	return VM_PAGER_FAIL;
 }
 
 static vm_object_t
-dead_pager_alloc(handle, size, prot, off)
-	void *handle;
-	vm_ooffset_t size;
-	vm_prot_t prot;
-	vm_ooffset_t off;
+dead_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
+    vm_ooffset_t off)
 {
 	return NULL;
 }
 
 static void
-dead_pager_putpages(object, m, count, flags, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	int flags;
-	int *rtvals;
+dead_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags,
+    int *rtvals)
 {
 	int i;
 
@@ -141,11 +130,7 @@ dead_pager_putpages(object, m, count, flags, rtvals)
 }
 
 static int
-dead_pager_haspage(object, pindex, prev, next)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int *prev;
-	int *next;
+dead_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *prev, int *next)
 {
 	if (prev)
 		*prev = 0;
@@ -155,8 +140,7 @@ dead_pager_haspage(object, pindex, prev, next)
 }
 
 static void
-dead_pager_dealloc(object)
-	vm_object_t object;
+dead_pager_dealloc(vm_object_t object)
 {
 	return;
 }
@@ -198,7 +182,7 @@ static int bswneeded;
 static vm_offset_t swapbkva;		/* swap buffers kva */
 
 void
-vm_pager_init()
+vm_pager_init(void)
 {
 	struct pagerops **pgops;
 
@@ -211,7 +195,7 @@ vm_pager_init()
 }
 
 void
-vm_pager_bufferinit()
+vm_pager_bufferinit(void)
 {
 	struct buf *bp;
 	int i;
@@ -252,8 +236,7 @@ vm_pager_allocate(objtype_t type, void *handle, vm_ooffset_t size, vm_prot_t pro
 }
 
 void
-vm_pager_deallocate(object)
-	vm_object_t object;
+vm_pager_deallocate(vm_object_t object)
 {
 	(*pagertab[object->type]->pgo_dealloc) (object);
 }
@@ -294,7 +277,7 @@ vm_pager_strategy(vm_object_t object, struct buf *bp)
  *	operations.
  */
 void
-vm_pager_sync()
+vm_pager_sync(void)
 {
 	struct pagerops **pgops;
 
@@ -306,8 +289,7 @@ vm_pager_sync()
 #endif
 
 vm_offset_t
-vm_pager_map_page(m)
-	vm_page_t m;
+vm_pager_map_page(vm_page_t m)
 {
 	vm_offset_t kva;
 
@@ -317,17 +299,14 @@ vm_pager_map_page(m)
 }
 
 void
-vm_pager_unmap_page(kva)
-	vm_offset_t kva;
+vm_pager_unmap_page(vm_offset_t kva)
 {
 	pmap_kremove(kva);
 	kmem_free_wakeup(pager_map, kva, PAGE_SIZE);
 }
 
 vm_object_t
-vm_pager_object_lookup(pg_list, handle)
-	struct pagerlst *pg_list;
-	void *handle;
+vm_pager_object_lookup(struct pagerlst *pg_list, void *handle)
 {
 	vm_object_t object;
 
@@ -370,8 +349,7 @@ initpbuf(struct buf *bp)
  *	relatively soon when the rest of the subsystems get smart about it. XXX
  */
 struct buf *
-getpbuf(pfreecnt)
-	int *pfreecnt;
+getpbuf(int *pfreecnt)
 {
 	int s;
 	struct buf *bp;
@@ -409,8 +387,7 @@ getpbuf(pfreecnt)
  *	call understand how to use pfreecnt.
  */
 struct buf *
-trypbuf(pfreecnt)
-	int *pfreecnt;
+trypbuf(int *pfreecnt)
 {
 	int s;
 	struct buf *bp;
@@ -438,9 +415,7 @@ trypbuf(pfreecnt)
  *	relatively soon when the rest of the subsystems get smart about it. XXX
  */
 void
-relpbuf(bp, pfreecnt)
-	struct buf *bp;
-	int *pfreecnt;
+relpbuf(struct buf *bp, int *pfreecnt)
 {
 	int s;
 
@@ -593,4 +568,3 @@ autochaindone(struct buf *bp)
 		bp->b_xflags |= BX_AUTOCHAINDONE;
 	splx(s);
 }
-
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 2ba3c64371..be4b8cddf6 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -32,7 +32,7 @@
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
  * $FreeBSD: src/sys/vm/vm_swap.c,v 1.96.2.2 2001/10/14 18:46:47 iedowse Exp $
- * $DragonFly: src/sys/vm/vm_swap.c,v 1.10 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vm_swap.c,v 1.11 2004/03/23 22:54:32 dillon Exp $
  */
 
 #include "opt_swap.h"
@@ -82,11 +82,10 @@ struct vnode *swapdev_vp;
  */
 
 static int
-swapdev_strategy(ap)
-	struct vop_strategy_args /* {
-		struct vnode *a_vp;
-		struct buf *a_bp;
-	} */ *ap;
+swapdev_strategy(struct vop_strategy_args /* {
+			 struct vnode *a_vp;
+			 struct buf *a_bp;
+		 } */ *ap)
 {
 	int s, sz, off, seg, index;
 	struct swdevt *sp;
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 81ccd0c1be..e071394e5d 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -39,7 +39,7 @@
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
  * $FreeBSD: src/sys/vm/vnode_pager.c,v 1.116.2.7 2002/12/31 09:34:51 dillon Exp $
- * $DragonFly: src/sys/vm/vnode_pager.c,v 1.11 2004/03/01 06:33:24 dillon Exp $
+ * $DragonFly: src/sys/vm/vnode_pager.c,v 1.12 2004/03/23 22:54:32 dillon Exp $
  */
 
 /*
@@ -165,8 +165,7 @@ vnode_pager_alloc(void *handle, vm_ooffset_t size, vm_prot_t prot,
 }
 
 static void
-vnode_pager_dealloc(object)
-	vm_object_t object;
+vnode_pager_dealloc(vm_object_t object)
 {
 	struct vnode *vp = object->handle;
 
@@ -182,11 +181,8 @@ vnode_pager_dealloc(object)
 }
 
 static boolean_t
-vnode_pager_haspage(object, pindex, before, after)
-	vm_object_t object;
-	vm_pindex_t pindex;
-	int *before;
-	int *after;
+vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+    int *after)
 {
 	struct vnode *vp = object->handle;
 	daddr_t bn;
@@ -262,9 +258,7 @@ vnode_pager_haspage(object, pindex, before, after)
  * operation (possibly at object termination time), so we must be careful.
  */
 void
-vnode_pager_setsize(vp, nsize)
-	struct vnode *vp;
-	vm_ooffset_t nsize;
+vnode_pager_setsize(struct vnode *vp, vm_ooffset_t nsize)
 {
 	vm_pindex_t nobjsize;
 	vm_object_t object = vp->v_object;
@@ -352,8 +346,7 @@ vnode_pager_setsize(vp, nsize)
 }
 
 void
-vnode_pager_freepage(m)
-	vm_page_t m;
+vnode_pager_freepage(vm_page_t m)
 {
 	vm_page_free(m);
 }
@@ -363,10 +356,7 @@ vnode_pager_freepage(m)
  * file address
  */
 static vm_offset_t
-vnode_pager_addr(vp, address, run)
-	struct vnode *vp;
-	vm_ooffset_t address;
-	int *run;
+vnode_pager_addr(struct vnode *vp, vm_ooffset_t address, int *run)
 {
 	int rtaddress;
 	int bsize;
@@ -406,8 +396,7 @@ vnode_pager_addr(vp, address, run)
  * interrupt routine for I/O completion
  */
 static void
-vnode_pager_iodone(bp)
-	struct buf *bp;
+vnode_pager_iodone(struct buf *bp)
 {
 	bp->b_flags |= B_DONE;
 	wakeup(bp);
@@ -417,9 +406,7 @@ vnode_pager_iodone(bp)
  * small block file system vnode pager input
  */
 static int
-vnode_pager_input_smlfs(object, m)
-	vm_object_t object;
-	vm_page_t m;
+vnode_pager_input_smlfs(vm_object_t object, vm_page_t m)
 {
 	int i;
 	int s;
@@ -508,9 +495,7 @@ vnode_pager_input_smlfs(object, m)
  * old style vnode pager output routine
  */
 static int
-vnode_pager_input_old(object, m)
-	vm_object_t object;
-	vm_page_t m;
+vnode_pager_input_old(vm_object_t object, vm_page_t m)
 {
 	struct uio auio;
 	struct iovec aiov;
@@ -578,11 +563,7 @@ vnode_pager_input_old(object, m)
  * backing vp's VOP_GETPAGES.
  */
 static int
-vnode_pager_getpages(object, m, count, reqpage)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	int reqpage;
+vnode_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 {
 	int rtval;
 	struct vnode *vp;
@@ -607,11 +588,8 @@ vnode_pager_getpages(object, m, count, reqpage)
  * own vnodes if they fail to implement VOP_GETPAGES.
  */
 int
-vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
-	struct vnode *vp;
-	vm_page_t *m;
-	int bytecount;
-	int reqpage;
+vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
+    int reqpage)
 {
 	vm_object_t object;
 	vm_offset_t kva;
@@ -880,12 +858,8 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
  * backing vp's VOP_PUTPAGES.
  */
 static void
-vnode_pager_putpages(object, m, count, sync, rtvals)
-	vm_object_t object;
-	vm_page_t *m;
-	int count;
-	boolean_t sync;
-	int *rtvals;
+vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
+    boolean_t sync, int *rtvals)
 {
 	int rtval;
 	struct vnode *vp;
@@ -929,12 +903,8 @@ vnode_pager_putpages(object, m, count, sync, rtvals)
  * then delayed.
  */
 int
-vnode_pager_generic_putpages(vp, m, bytecount, flags, rtvals)
-	struct vnode *vp;
-	vm_page_t *m;
-	int bytecount;
-	int flags;
-	int *rtvals;
+vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m, int bytecount,
+    int flags, int *rtvals)
 {
 	int i;
 	vm_object_t object;
-- 
2.41.0