Big cleanup of VM issues:

o get rid of m88k_foo macros when there is an mi foo macro
o remove the ability, for the pmap module, to handle a native mmu page
  size different from the vm module page size. This allows some
  optimizations in pmap.c
o remove dead stuff from <machine/vmparam.h>

1 files changed, 5 insertions, 2 deletions

diff --git a/sys/arch/mvme88k/dev/nvram.c b/sys/arch/mvme88k/dev/nvram.c
index a6a9f5d098a..c43013944c3 100644
--- a/sys/arch/mvme88k/dev/nvram.c
+++ b/sys/arch/mvme88k/dev/nvram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvram.c,v 1.9 2001/03/09 05:44:39 smurph Exp $ */
+/*	$OpenBSD: nvram.c,v 1.10 2001/06/14 21:30:34 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -43,6 +43,7 @@
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
+
 #include <machine/psl.h>
 #include <machine/autoconf.h>
 #include <machine/bugio.h>
@@ -50,6 +51,8 @@
 #include <machine/mioctl.h>
 #include <machine/vmparam.h>
 
+#include <vm/vm_param.h>
+
 #include <mvme88k/dev/memdevs.h>
 #include <mvme88k/dev/nvramreg.h>
 #include <mvme88k/dev/pcctworeg.h>
@@ -496,5 +499,5 @@ nvrammmap(dev, off, prot)
 	/* allow access only in RAM */
 	if (off > sc->sc_len)
 		return (-1);
-	return (m88k_btop(sc->sc_paddr + off));
+	return (atop(sc->sc_paddr + off));
 }