From ee3a64c9927bb5adb2ad7560b46b296c0faeb358 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Wed, 10 May 1995 18:56:09 +0000
Subject: [PATCH] Changed "handle" from type caddr_t to void *; "handle" is
 several different types of pointers, and "char *" is a bad choice for the
 type.

---
 sys/vm/device_pager.c | 6 +++---
 sys/vm/swap_pager.c   | 4 ++--
 sys/vm/swap_pager.h   | 4 ++--
 sys/vm/vm_extern.h    | 4 ++--
 sys/vm/vm_pageout.c   | 4 ++--
 sys/vm/vm_pager.c     | 4 ++--
 sys/vm/vm_pager.h     | 8 ++++----
 sys/vm/vnode_pager.c  | 4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 80ef25257336..7cbe34b73e80 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.7 1995/03/11 22:25:00 davidg Exp $
+ * $Id: device_pager.c,v 1.8 1995/04/16 12:56:11 davidg Exp $
  */
 
 /*
@@ -67,7 +67,7 @@ int dpagerdebug;
 #define DDB_FAIL	0x08
 #endif
 
-static vm_pager_t dev_pager_alloc __P((caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
+static vm_pager_t dev_pager_alloc __P((void *, vm_size_t, vm_prot_t, vm_offset_t));
 static void dev_pager_dealloc __P((vm_pager_t));
 static int dev_pager_getpage __P((vm_pager_t, vm_page_t, boolean_t));
 static boolean_t dev_pager_haspage __P((vm_pager_t, vm_offset_t));
@@ -100,7 +100,7 @@ dev_pager_init()
 
 static vm_pager_t
 dev_pager_alloc(handle, size, prot, foff)
-	caddr_t handle;
+	void *handle;
 	vm_size_t size;
 	vm_prot_t prot;
 	vm_offset_t foff;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 430562503e30..32f97a5ae1ce 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.36 1995/05/07 03:48:54 dyson Exp $
+ * $Id: swap_pager.c,v 1.37 1995/05/07 06:36:59 dyson Exp $
  */
 
 /*
@@ -179,7 +179,7 @@ swap_pager_init()
  */
 vm_pager_t
 swap_pager_alloc(handle, size, prot, offset)
-	caddr_t handle;
+	void *handle;
 	register vm_size_t size;
 	vm_prot_t prot;
 	vm_offset_t offset;
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index d14d0e15df60..5a1393f5e0e1 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.4 1995/01/09 16:05:37 davidg Exp $
+ *	$Id: swap_pager.h,v 1.5 1995/02/02 09:08:09 davidg Exp $
  */
 
 /*
@@ -83,7 +83,7 @@ typedef struct swpager *sw_pager_t;
 #ifdef KERNEL
 
 void swap_pager_init(void);
-vm_pager_t swap_pager_alloc(caddr_t, vm_size_t, vm_prot_t, vm_offset_t);
+vm_pager_t swap_pager_alloc(void *, vm_size_t, vm_prot_t, vm_offset_t);
 void swap_pager_dealloc(vm_pager_t);
 boolean_t swap_pager_getpage(vm_pager_t, vm_page_t, boolean_t);
 boolean_t swap_pager_putpage(vm_pager_t, vm_page_t, boolean_t);
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 2dae26e7e700..fb752c157d2d 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.12 1995/02/21 01:32:47 davidg Exp $
+ * $Id: vm_extern.h,v 1.13 1995/03/16 18:17:08 bde Exp $
  */
 
 #ifndef _VM_EXTERN_H_
@@ -122,7 +122,7 @@ struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
 struct vmspace *vmspace_fork __P((struct vmspace *));
 void vmspace_free __P((struct vmspace *));
 void vmtotal __P((struct vmtotal *));
-vm_pager_t vnode_pager_alloc __P((caddr_t, vm_offset_t, vm_prot_t, vm_offset_t));
+vm_pager_t vnode_pager_alloc __P((void *, vm_offset_t, vm_prot_t, vm_offset_t));
 void vnode_pager_setsize __P((struct vnode *, u_long));
 void vnode_pager_umount __P((struct mount *));
 boolean_t vnode_pager_uncache __P((struct vnode *));
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 693d1af3e6c7..3b54c9e6894f 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.47 1995/04/16 14:12:15 davidg Exp $
+ * $Id: vm_pageout.c,v 1.48 1995/04/17 10:00:55 davidg Exp $
  */
 
 /*
@@ -251,7 +251,7 @@ vm_pageout_clean(m, sync)
 
 		object->paging_in_progress++;
 
-		pager = vm_pager_allocate(PG_DFLT, (caddr_t) 0,
+		pager = vm_pager_allocate(PG_DFLT, 0,
 		    object->size, VM_PROT_ALL, 0);
 		if (pager != NULL) {
 			object->pager = pager;
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 8b84f65b29b7..f7f1976d7b6b 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.13 1995/03/11 22:25:20 davidg Exp $
+ * $Id: vm_pager.c,v 1.14 1995/04/25 06:22:47 davidg Exp $
  */
 
 /*
@@ -157,7 +157,7 @@ vm_pager_bufferinit()
 vm_pager_t
 vm_pager_allocate(type, handle, size, prot, off)
 	int type;
-	caddr_t handle;
+	void *handle;
 	vm_size_t size;
 	vm_prot_t prot;
 	vm_offset_t off;
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index 9dfbe7325ac2..1cab34a5045b 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.5 1995/01/09 16:05:56 davidg Exp $
+ * $Id: vm_pager.h,v 1.6 1995/03/16 18:17:32 bde Exp $
  */
 
 /*
@@ -52,7 +52,7 @@ TAILQ_HEAD(pagerlst, pager_struct);
 
 struct pager_struct {
 	TAILQ_ENTRY(pager_struct) pg_list;	/* links for list management */
-	caddr_t pg_handle;		/* ext. handle (vp, dev, fp) */
+	void *pg_handle;		/* ext. handle (vp, dev, fp) */
 	int pg_type;			/* type of pager */
 	struct pagerops *pg_ops;	/* pager operations */
 	void *pg_data;			/* private pager data */
@@ -70,7 +70,7 @@ struct pager_struct {
 
 struct pagerops {
 	void (*pgo_init) __P((void));		/* Initialize pager. */
-	vm_pager_t(*pgo_alloc) __P((caddr_t, vm_size_t, vm_prot_t, vm_offset_t));	/* Allocate pager. */
+	vm_pager_t(*pgo_alloc) __P((void *, vm_size_t, vm_prot_t, vm_offset_t));	/* Allocate pager. */
 	void (*pgo_dealloc) __P((vm_pager_t));	/* Disassociate. */
 	int (*pgo_getpage) __P((vm_pager_t, vm_page_t, boolean_t));
 	int (*pgo_getpages) __P((vm_pager_t, vm_page_t *, int, int, boolean_t));	/* Get (read) page. */
@@ -106,7 +106,7 @@ struct pagerops {
 #ifdef KERNEL
 extern struct pagerops *dfltpagerops;
 
-vm_pager_t vm_pager_allocate __P((int, caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
+vm_pager_t vm_pager_allocate __P((int, void *, vm_size_t, vm_prot_t, vm_offset_t));
 vm_page_t vm_pager_atop __P((vm_offset_t));
 void vm_pager_bufferinit __P((void));
 void vm_pager_deallocate __P((vm_pager_t));
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 074f25cc4af7..f462e312efba 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.36 1995/03/21 23:09:53 davidg Exp $
+ *	$Id: vnode_pager.c,v 1.37 1995/04/09 06:03:56 davidg Exp $
  */
 
 /*
@@ -117,7 +117,7 @@ vnode_pager_init()
  */
 vm_pager_t
 vnode_pager_alloc(handle, size, prot, offset)
-	caddr_t handle;
+	void *handle;
 	vm_size_t size;
 	vm_prot_t prot;
 	vm_offset_t offset;