Fixed various prototype problems with the pmap functions and the subsequent

problems that fixing them caused.

2 files changed, 33 insertions, 33 deletions

diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 3a95abc..4737fd4 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id$
+ * $Id: pmap.h,v 1.2 1994/08/02 07:55:12 davidg Exp $
  */
 
 /*
@@ -88,36 +88,36 @@ typedef struct pmap_statistics	*pmap_statistics_t;
 
 #ifdef KERNEL
 __BEGIN_DECLS
-void		*pmap_bootstrap_alloc __P((int));
-void		 pmap_bootstrap( /* machine dependent */ );
-void		 pmap_change_wiring __P((pmap_t, vm_offset_t, boolean_t));
-void		 pmap_clear_modify __P((vm_offset_t pa));
-void		 pmap_clear_reference __P((vm_offset_t pa));
-void		 pmap_collect __P((pmap_t));
-void		 pmap_copy __P((pmap_t,
-		    pmap_t, vm_offset_t, vm_size_t, vm_offset_t));
-void		 pmap_copy_page __P((vm_offset_t, vm_offset_t));
-pmap_t		 pmap_create __P((vm_size_t));
-void		 pmap_destroy __P((pmap_t));
-void		 pmap_enter __P((pmap_t,
-		    vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
-vm_offset_t	 pmap_extract __P((pmap_t, vm_offset_t));
-void		 pmap_init __P((vm_offset_t, vm_offset_t));
-boolean_t	 pmap_is_modified __P((vm_offset_t pa));
-boolean_t	 pmap_is_referenced __P((vm_offset_t pa));
-vm_offset_t	 pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int));
-void		 pmap_page_protect __P((vm_offset_t, vm_prot_t));
-void		 pmap_pageable __P((pmap_t,
-		    vm_offset_t, vm_offset_t, boolean_t));
-vm_offset_t	 pmap_phys_address __P((int));
-void		 pmap_pinit __P((pmap_t));
-void		 pmap_protect __P((pmap_t,
-		    vm_offset_t, vm_offset_t, vm_prot_t));
-void		 pmap_reference __P((pmap_t));
-void		 pmap_release __P((pmap_t));
-void		 pmap_remove __P((pmap_t, vm_offset_t, vm_offset_t));
-void		 pmap_update __P((void));
-void		 pmap_zero_page __P((vm_offset_t));
+void *		pmap_bootstrap_alloc	__P((int));
+void		pmap_bootstrap		__P((/* machine dependent */));
+void		pmap_change_wiring	__P((pmap_t, vm_offset_t, boolean_t));
+void		pmap_clear_modify	__P((vm_offset_t pa));
+void		pmap_clear_reference	__P((vm_offset_t pa));
+void		pmap_collect		__P((pmap_t));
+void		pmap_copy		__P((pmap_t, pmap_t, vm_offset_t, vm_size_t, vm_offset_t));
+void		pmap_copy_page		__P((vm_offset_t, vm_offset_t));
+pmap_t		pmap_create		__P((vm_size_t));
+void		pmap_destroy		__P((pmap_t));
+void		pmap_enter		__P((pmap_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
+vm_offset_t	pmap_extract		__P((pmap_t, vm_offset_t));
+void		pmap_init		__P((vm_offset_t, vm_offset_t));
+boolean_t	pmap_is_modified	__P((vm_offset_t pa));
+boolean_t	pmap_is_referenced	__P((vm_offset_t pa));
+void		pmap_kenter		__P((vm_offset_t, vm_offset_t));
+void		pmap_kremove		__P((vm_offset_t));
+vm_offset_t	pmap_map		__P((vm_offset_t, vm_offset_t, vm_offset_t, int));
+void		pmap_page_protect	__P((vm_offset_t, vm_prot_t));
+void		pmap_pageable		__P((pmap_t, vm_offset_t, vm_offset_t, boolean_t));
+vm_offset_t	pmap_phys_address	__P((int));
+void		pmap_pinit		__P((pmap_t));
+void		pmap_protect		__P((pmap_t, vm_offset_t, vm_offset_t, vm_prot_t));
+void		pmap_qenter		__P((vm_offset_t, vm_page_t *, int));
+void		pmap_qremove		__P((vm_offset_t, int));
+void		pmap_reference		__P((pmap_t));
+void		pmap_release		__P((pmap_t));
+void		pmap_remove		__P((pmap_t, vm_offset_t, vm_offset_t));
+void		pmap_update		__P((void));
+void		pmap_zero_page		__P((vm_offset_t));
 __END_DECLS
 #endif
 
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 3294e6e..aad8ebd 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.3 1994/08/04 03:06:48 davidg Exp $
+ *	$Id: vnode_pager.c,v 1.4 1994/08/06 09:15:42 davidg Exp $
  */
 
 /*
@@ -1043,7 +1043,7 @@ vnode_pager_input(vnp, m, count, reqpage)
 		for(i=0;i<counta;i++) {
 			vm_page_deactivate(m[count+i]);
 		}
-		pmap_qenter(bpa->b_data, &m[count], counta);
+		pmap_qenter((vm_offset_t)bpa->b_data, &m[count], counta);
 		++m[count]->object->paging_in_progress;
 		VHOLD(vp);
 		bpa->b_flags = B_BUSY | B_READ | B_CALL | B_ASYNC;