Replace the last user of pmap_map() with an inline version, and kill pmap_map()

for good.

2 files changed, 6 insertions, 9 deletions

diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index 107c9b02bca..6d0f75cf370 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.18 2003/03/01 00:28:48 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.19 2005/04/27 00:12:43 miod Exp $	*/
 
 #ifndef	_MAC68K_PMAP_H_
 #define	_MAC68K_PMAP_H_
@@ -6,13 +6,8 @@
 #include <m68k/pmap_motorola.h>
 
 #ifdef	_KERNEL
-
-vaddr_t	pmap_map(vaddr_t, paddr_t, paddr_t, int);
-void mac68k_set_pte(vaddr_t, paddr_t);
-
 void pmap_init_md(void);
 #define	PMAP_INIT_MD()	pmap_init_md()
-
 #endif	/* _KERNEL */
 
 #endif	/* _MAC68K_PMAP_H_ */
diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index d758479ae79..b85ab4f5c8e 100644
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macrom.c,v 1.27 2005/02/20 18:08:08 martin Exp $	*/
+/*	$OpenBSD: macrom.c,v 1.28 2005/04/27 00:12:43 miod Exp $	*/
 /*	$NetBSD: macrom.c,v 1.47 2000/11/15 07:15:36 scottr Exp $	*/
 
 /*-
@@ -791,6 +791,7 @@ void
 mrg_init()
 {
 	char *findername = "MacBSD FakeFinder";
+	vaddr_t va;
 	int i;
 #if defined(MRG_TEST)
 	caddr_t ptr;
@@ -1018,8 +1019,9 @@ mrg_init()
 		printf("mrg: I/O map kludge for ROMs that use hardware %s",
 			"addresses directly.\n");
 #endif
-		pmap_map(0x50f00000, 0x50f00000, 0x50f00000 + 0x4000,
-			 VM_PROT_READ|VM_PROT_WRITE);
+		for (va = 0x50f00000; va < 0x50f04000; va += PAGE_SIZE)
+			pmap_kenter_pa(va, (paddr_t)va, UVM_PROT_RW);
+		pmap_update(pmap_kernel());
 	}
 }