diff --git a/sys/arch/sun2/sun2/mbio.c b/sys/arch/sun2/sun2/mbio.c
index 284b2e35d696..e2b59053af6d 100644
--- a/sys/arch/sun2/sun2/mbio.c
+++ b/sys/arch/sun2/sun2/mbio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbio.c,v 1.5 2001/06/27 03:00:45 fredette Exp $	*/
+/*	$NetBSD: mbio.c,v 1.6 2001/11/30 18:11:56 fredette Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -65,8 +65,8 @@ struct cfattach mbio_ca = {
 	sizeof(struct mbio_softc), mbio_match, mbio_attach
 };
 
-static	int mbio_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-			       int, bus_space_handle_t *));
+static	paddr_t mbio_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
+			       off_t, int, int));
 static	int _mbio_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
 			       bus_size_t, int,
 			       vaddr_t, bus_space_handle_t *));
@@ -165,15 +165,17 @@ _mbio_bus_map(t, btype, paddr, size, flags, vaddr, hp)
 				size, flags | _SUN68K_BUS_MAP_USE_PROM, vaddr, hp));
 }
 
-int
-mbio_bus_mmap(t, btype, paddr, flags, hp)
+paddr_t
+mbio_bus_mmap(t, btype, paddr, off, prot, flags)
 	bus_space_tag_t t;
 	bus_type_t btype;
 	bus_addr_t paddr;
+	off_t off;
+	int prot;
 	int flags;
-	bus_space_handle_t *hp;
 {
 	struct mbio_softc *sc = t->cookie;
 
-	return (bus_space_mmap(sc->sc_bustag, PMAP_MBIO, paddr, flags, hp));
+	return (bus_space_mmap2(sc->sc_bustag, PMAP_MBIO, paddr, off,
+				prot, flags));
 }
diff --git a/sys/arch/sun2/sun2/mbmem.c b/sys/arch/sun2/sun2/mbmem.c
index 5f543d26956f..7ccda1426c14 100644
--- a/sys/arch/sun2/sun2/mbmem.c
+++ b/sys/arch/sun2/sun2/mbmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbmem.c,v 1.6 2001/06/27 03:00:45 fredette Exp $	*/
+/*	$NetBSD: mbmem.c,v 1.7 2001/11/30 18:11:56 fredette Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -67,8 +67,8 @@ struct cfattach mbmem_ca = {
 	sizeof(struct mbmem_softc), mbmem_match, mbmem_attach
 };
 
-static	int mbmem_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-			       int, bus_space_handle_t *));
+static	paddr_t mbmem_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
+				off_t, int, int));
 static	int _mbmem_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
 			       bus_size_t, int,
 			       vaddr_t, bus_space_handle_t *));
@@ -179,17 +179,19 @@ _mbmem_bus_map(t, btype, paddr, size, flags, vaddr, hp)
 				size, flags, vaddr, hp));
 }
 
-int
-mbmem_bus_mmap(t, btype, paddr, flags, hp)
+paddr_t
+mbmem_bus_mmap(t, btype, paddr, off, prot, flags)
 	bus_space_tag_t t;
 	bus_type_t btype;
 	bus_addr_t paddr;
+	off_t off;
+	int prot;
 	int flags;
-	bus_space_handle_t *hp;
 {
 	struct mbmem_softc *sc = t->cookie;
 
-	return (bus_space_mmap(sc->sc_bustag, PMAP_MBMEM, paddr, flags, hp));
+	return (bus_space_mmap2(sc->sc_bustag, PMAP_MBMEM, paddr, off,
+				prot, flags));
 }
 
 static int
diff --git a/sys/arch/sun2/sun2/obio.c b/sys/arch/sun2/sun2/obio.c
index 2ed455db9482..64405a327f94 100644
--- a/sys/arch/sun2/sun2/obio.c
+++ b/sys/arch/sun2/sun2/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.5 2001/07/12 19:24:40 fredette Exp $	*/
+/*	$NetBSD: obio.c,v 1.6 2001/11/30 18:11:56 fredette Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -65,8 +65,8 @@ struct cfattach obio_ca = {
 	sizeof(struct obio_softc), obio_match, obio_attach
 };
 
-static	int obio_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-			       int, bus_space_handle_t *));
+static	paddr_t obio_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
+			       off_t, int, int));
 static	int _obio_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
 			       bus_size_t, int,
 			       vaddr_t, bus_space_handle_t *));
@@ -169,17 +169,19 @@ _obio_bus_map(t, btype, paddr, size, flags, vaddr, hp)
 				size, flags | _SUN68K_BUS_MAP_USE_PROM, vaddr, hp));
 }
 
-int
-obio_bus_mmap(t, btype, paddr, flags, hp)
+paddr_t
+obio_bus_mmap(t, btype, paddr, off, prot, flags)
 	bus_space_tag_t t;
 	bus_type_t btype;
 	bus_addr_t paddr;
+	off_t off;
+	int prot;
 	int flags;
-	bus_space_handle_t *hp;
 {
 	struct obio_softc *sc = t->cookie;
 
-	return (bus_space_mmap(sc->sc_bustag, PMAP_OBIO, paddr, flags, hp));
+	return (bus_space_mmap2(sc->sc_bustag, PMAP_OBIO, paddr, off,
+				prot, flags));
 }
 
 /*
@@ -197,7 +199,7 @@ _obio_addr_bad(t, h, o, s)
 	paddr_t pa;
 
 	/* Get the physical address for this page. */
-	pte = get_pte((vm_offset_t) (h + o));
+	pte = get_pte((vaddr_t) (h + o));
 	if (!(pte & PG_VALID))
 		return (-1);
 	pa = PG_PA(pte);
diff --git a/sys/arch/sun2/sun2/obmem.c b/sys/arch/sun2/sun2/obmem.c
index 8c6c9168cd1a..cf8d4e2d8f21 100644
--- a/sys/arch/sun2/sun2/obmem.c
+++ b/sys/arch/sun2/sun2/obmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.4 2001/06/27 03:00:46 fredette Exp $	*/
+/*	$NetBSD: obmem.c,v 1.5 2001/11/30 18:11:56 fredette Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@ struct cfattach obmem_ca = {
 	sizeof(struct obmem_softc), obmem_match, obmem_attach
 };
 
-static	int obmem_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
-			       int, bus_space_handle_t *));
+static	paddr_t obmem_bus_mmap __P((bus_space_tag_t, bus_type_t, bus_addr_t,
+				off_t, int, int));
 static	int _obmem_bus_map __P((bus_space_tag_t, bus_type_t, bus_addr_t,
 			       bus_size_t, int,
 			       vaddr_t, bus_space_handle_t *));
@@ -158,15 +158,17 @@ _obmem_bus_map(t, btype, paddr, size, flags, vaddr, hp)
 				size, flags, vaddr, hp));
 }
 
-int
-obmem_bus_mmap(t, btype, paddr, flags, hp)
+paddr_t
+obmem_bus_mmap(t, btype, paddr, off, prot, flags)
 	bus_space_tag_t t;
 	bus_type_t btype;
 	bus_addr_t paddr;
+	off_t off;
+	int prot;
 	int flags;
-	bus_space_handle_t *hp;
 {
 	struct obmem_softc *sc = t->cookie;
 
-	return (bus_space_mmap(sc->sc_bustag, PMAP_OBMEM, paddr, flags, hp));
+	return (bus_space_mmap2(sc->sc_bustag, PMAP_OBMEM, paddr, off,
+				prot, flags));
 }