7 files changed, 10 insertions, 10 deletions
diff --git a/i386/i386/locore.h b/i386/i386/locore.h
index b873e6f..5701430 100644
--- a/i386/i386/locore.h
+++ b/i386/i386/locore.h
@@ -26,11 +26,11 @@
 
 extern int copyin (const void *userbuf, void *kernelbuf, size_t cn);
 
-extern int copyinmsg (vm_offset_t userbuf, vm_offset_t kernelbuf, size_t cn);
+extern int copyinmsg (const void *userbuf, void *kernelbuf, size_t cn);
 
 extern int copyout (const void *kernelbuf, void *userbuf, size_t cn);
 
-extern int copyoutmsg (vm_offset_t kernelbuf, vm_offset_t userbuf, size_t cn);
+extern int copyoutmsg (const void *kernelbuf, void *userbuf, size_t cn);
 
 extern int call_continuation (continuation_t continuation);
 
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index a4cfbf8..4ba625d 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -433,7 +433,7 @@ io_return_t comportdeath(dev, port)
 dev_t		dev;
 mach_port_t	port;
 {
-	return (tty_portdeath(&com_tty[minor(dev)], port));
+	return (tty_portdeath(&com_tty[minor(dev)], (ipc_port_t)port));
 }
 
 io_return_t
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 8975ad1..a0a36b7 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -590,7 +590,7 @@ kdportdeath(dev, port)
 	dev_t	dev;
 	mach_port_t	port;
 {
-	return (tty_portdeath(&kd_tty, port));
+	return (tty_portdeath(&kd_tty, (ipc_port_t)port));
 }
 
 /*ARGSUSED*/
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index 94ebd79..0b4acc2 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -603,7 +603,7 @@ mouse_handle_byte(ch)
 	        mousebuf[mousebufindex++] = ch;
 	    if (mouse_char_wanted) {
 		mouse_char_wanted = FALSE;
-		wakeup(&mousebuf);
+		wakeup((vm_offset_t)&mousebuf);
 	    }
 	    return;
 	}
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index ee8e721..07e8414 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -203,7 +203,7 @@ lprportdeath(dev, port)
 dev_t		dev;
 mach_port_t	port;
 {
-	return (tty_portdeath(&lpr_tty[minor(dev)], port));
+	return (tty_portdeath(&lpr_tty[minor(dev)], (ipc_port_t)port));
 }
 
 io_return_t
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 539e3f0..b08252e 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -927,7 +927,7 @@ void pmap_destroy(p)
 		vm_object_unlock(pmap_object);
 	    }
 	}
-	kmem_free(kernel_map, p->dirbase, INTEL_PGBYTES);
+	kmem_free(kernel_map, (vm_offset_t)p->dirbase, INTEL_PGBYTES);
 	zfree(pmap_zone, (vm_offset_t) p);
 }
 
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index b16d984..c1d741b 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -234,7 +234,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 	    /*								\
 	     *	If this is the kernel pmap, switch to its page tables.	\
 	     */								\
-	    set_dirbase(kvtophys(tpmap->dirbase));			\
+	    set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase));			\
 	}								\
 	else {								\
 	    /*								\
@@ -252,7 +252,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 	     *	No need to invalidate the TLB - the entire user pmap	\
 	     *	will be invalidated by reloading dirbase.		\
 	     */								\
-	    set_dirbase(kvtophys(tpmap->dirbase));			\
+	    set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase));			\
 									\
 	    /*								\
 	     *	Mark that this cpu is using the pmap.			\
@@ -341,7 +341,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
 #define	PMAP_ACTIVATE_USER(pmap, th, my_cpu)	{			\
 	register pmap_t		tpmap = (pmap);				\
 									\
-	set_dirbase(kvtophys(tpmap->dirbase));				\
+	set_dirbase(kvtophys((vm_offset_t)tpmap->dirbase));				\
 	if (tpmap != kernel_pmap) {					\
 	    tpmap->cpus_using = TRUE;					\
 	}								\