Use the generic m68k param.h.

11 files changed, 54 insertions, 140 deletions

diff --git a/sys/arch/mac68k/dev/asc.c b/sys/arch/mac68k/dev/asc.c
index 5cd6ce22626..77c933e2395 100644
--- a/sys/arch/mac68k/dev/asc.c
+++ b/sys/arch/mac68k/dev/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.8 1998/11/20 23:57:24 deraadt Exp $	*/
+/*	$OpenBSD: asc.c,v 1.9 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: asc.c,v 1.20 1997/02/24 05:47:33 scottr Exp $	*/
 
 /*
@@ -283,7 +283,7 @@ ascmmap(dev, off, prot)
 	sc = asc_cd.cd_devs[unit];
 	if (off >= 0 && off < MAC68K_ASC_LEN) {
 		pa = pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_handle);
-		return mac68k_btop(pa + off);
+		return m68k_btop(pa + off);
 	}
 
 	return (-1);
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index 694423e145d..8ed4a43d03e 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.8 1998/11/20 23:57:24 deraadt Exp $	*/
+/*	$OpenBSD: grf.c,v 1.9 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $	*/
 
 /*
@@ -331,9 +331,9 @@ grfaddr(gp, off)
 	register struct grfmode *gm = gp->sc_grfmode;
 	u_long	addr;
 
-	if (off >= 0 && off < mac68k_round_page(gm->fbsize + gm->fboff)) {
+	if (off >= 0 && off < m68k_round_page(gm->fbsize + gm->fboff)) {
 		addr = (u_long)(*gp->sc_phys)(gp, (vm_offset_t)gm->fbbase)+off;
-		return mac68k_btop(addr);
+		return m68k_btop(addr);
 	}
 	/* bogus */
 	return (-1);
@@ -357,13 +357,13 @@ grfmap(dev, addrp, p)
 	if (grfdebug & GDB_MMAP)
 		printf("grfmap(%d): addr %p\n", p->p_pid, *addrp);
 #endif
-	len = mac68k_round_page(gp->sc_grfmode->fbsize + gp->sc_grfmode->fboff);
+	len = m68k_round_page(gp->sc_grfmode->fbsize + gp->sc_grfmode->fboff);
 	flags = MAP_SHARED | MAP_FIXED;
 
 	if (gp->sc_slot == NULL)
-		*addrp = (caddr_t) mac68k_trunc_page(mac68k_vidphys);
+		*addrp = (caddr_t) m68k_trunc_page(mac68k_vidphys);
 	else
-		*addrp = (caddr_t) mac68k_trunc_page(
+		*addrp = (caddr_t) m68k_trunc_page(
 		    NUBUS_SLOT2PA(gp->sc_slot->slot));
 
 	vn.v_type = VCHR;	/* XXX */
diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c
index 3c62606d8da..19ec1dd9703 100644
--- a/sys/arch/mac68k/dev/grf_iv.c
+++ b/sys/arch/mac68k/dev/grf_iv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_iv.c,v 1.18 1999/01/11 05:11:34 millert Exp $	*/
+/*	$OpenBSD: grf_iv.c,v 1.19 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $	*/
 
 /*
@@ -180,7 +180,7 @@ grfiv_attach(parent, self, aux)
 	gm->hres = 80;		/* XXX Hack */
 	gm->vres = 80;		/* XXX Hack */
 	gm->fbsize = gm->rowbytes * gm->height;
-	gm->fbbase = (caddr_t) mac68k_trunc_page(mac68k_vidlog);
+	gm->fbbase = (caddr_t) m68k_trunc_page(mac68k_vidlog);
 	gm->fboff = mac68k_vidlog & PGOFSET;
 
 	/* Perform common video attachment. */
diff --git a/sys/arch/mac68k/dev/grf_mv.c b/sys/arch/mac68k/dev/grf_mv.c
index 6a01bf0164f..e54930c019f 100644
--- a/sys/arch/mac68k/dev/grf_mv.c
+++ b/sys/arch/mac68k/dev/grf_mv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_mv.c,v 1.16 1997/05/03 02:30:29 briggs Exp $	*/
+/*	$OpenBSD: grf_mv.c,v 1.17 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: grf_mv.c,v 1.24 1997/05/03 02:29:54 briggs Exp $	*/
 
 /*
@@ -184,7 +184,7 @@ grfmv_attach(parent, self, aux)
 	gm = &sc->curr_mode;
 	gm->mode_id = mode;
 	gm->fbbase = (caddr_t)(sc->sc_slot.virtual_base +
-				mac68k_trunc_page(image.offset));
+				m68k_trunc_page(image.offset));
 	gm->fboff = image.offset & PGOFSET;
 	gm->rowbytes = image.rowbytes;
 	gm->width = image.right - image.left;
diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c
index 8a10045ac9e..aa959045288 100644
--- a/sys/arch/mac68k/dev/nubus.c
+++ b/sys/arch/mac68k/dev/nubus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nubus.c,v 1.12 1997/04/24 02:10:15 gene Exp $	*/
+/*	$OpenBSD: nubus.c,v 1.13 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $	*/
 
 /*
@@ -814,7 +814,7 @@ nubus_mapin(paddr, sz)
 	off = paddr & PGOFSET;
 	pa = paddr - off;
 	sz += off;
-	sz = mac68k_round_page(sz);
+	sz = m68k_round_page(sz);
 
 	/* Get some kernel virtual address space. */
 	va = kmem_alloc_wait(kernel_map, sz);
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index 6628d08f6df..eff676c12d0 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.8 1998/05/03 07:10:47 gene Exp $	*/
+/*	$OpenBSD: param.h,v 1.9 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $	*/
 
 /*
@@ -80,11 +80,8 @@
 #ifndef _MAC68K_PARAM_H_
 #define _MAC68K_PARAM_H_
 
-#ifndef PSL_IPL
-#include <machine/psl.h>
-#endif /* PSL_IPL */
-
 /* Pull in interrupt glue */
+#include <machine/psl.h>
 #include <machine/intr.h>
 
 /*
@@ -92,72 +89,19 @@
  */
 #define	_MACHINE	mac68k
 #define	MACHINE		"mac68k"
-#define	_MACHINE_ARCH	m68k
-#define	MACHINE_ARCH	"m68k"
-#define	MID_MACHINE	MID_M68K
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is u_int and
- * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits). 
- *
- */
-#define ALIGNBYTES		(sizeof(int) - 1)
-#define	ALIGN(p)		(((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#define ALIGNED_POINTER(p,t)	((((u_long)(p)) & (sizeof(t)-1)) == 0)
 
 #define	PGSHIFT		12		/* LOG2(NBPG) */
-#define	NBPG		(1 << PGSHIFT)	/* bytes/page */
-#define	PGOFSET		(NBPG-1)	/* byte offset into page */
-#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
+#define	KERNBASE	0x00000000	/* start of kernel virtual */
 
 #define	SEGSHIFT	22		/* LOG2(NBSEG) */
 #define NBSEG		(1 << SEGSHIFT)	/* bytes/segment */
 #define	SEGOFSET	(NBSEG-1)	/* byte offset into segment */
 
-#define	KERNBASE	0x00000000	/* start of kernel virtual */
-#define	BTOPKERNBASE	((u_long)KERNBASE >> PGSHIFT)
-
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define	DEV_BSIZE	(1 << DEV_BSHIFT)
-#define BLKDEV_IOSIZE	2048
-#define	MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-
-#define	CLSIZELOG2	0
-#define	CLSIZE		(1 << CLSIZELOG2)
-
-/* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */
-#define	SSIZE		1		/* initial stack size/NBPG */
-#define	SINCR		1		/* increment of stack/NBPG */
 #define	UPAGES		3  		/* pages of u-area */
-#define USPACE		(UPAGES * NBPG)	/* total size of u-area */
 
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#define	MSIZE		128		/* size of an mbuf */
-#ifndef MCLSHIFT
-#define MCLSHIFT        11              /* convert bytes to m_buf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES        (1 << MCLSHIFT) /* size of an m_buf cluster */
-#define MCLOFSET        (MCLBYTES - 1)  /* offset within an m_buf cluster */
+#include <m68k/param.h>
 
-#ifndef NMBCLUSTERS
-#ifdef GATEWAY
-#define	NMBCLUSTERS	512		/* map size, max cluster allocation */
-#else
-#define	NMBCLUSTERS	256		/* map size, max cluster allocation */
-#endif
-#endif
+#define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
 
 /*
  * Size of kernel malloc arena in CLBYTES-sized logical pages
@@ -166,36 +110,6 @@
 #define	NKMEMCLUSTERS	(2048 * 1024 / CLBYTES)
 #endif
 
-/* pages ("clicks") to disk blocks */
-#define	ctod(x)		((x) << (PGSHIFT - DEV_BSHIFT))
-#define	dtoc(x)		((x) >> (PGSHIFT - DEV_BSHIFT))
-
-/* pages to bytes */
-#define	ctob(x)		((x) << PGSHIFT)
-#define	btoc(x)		(((x) + PGOFSET) >> PGSHIFT)
-
-/* bytes to disk blocks */
-#define	btodb(x)	((x) >> DEV_BSHIFT)
-#define	dbtob(x)	((x) << DEV_BSHIFT)
-
-/*
- * Map a ``block device block'' to a file system block.
- * This should be device dependent, and should use the bsize
- * field from the disk label.
- * For now though just use DEV_BSIZE.
- */
-#define	bdbtofsb(bn)	((bn) / (BLKDEV_IOSIZE / DEV_BSIZE))
-
-/*
- * Mach derived conversion macros
- */
-#define mac68k_round_page(x)	((((unsigned)(x)) + PGOFSET) & ~PGOFSET)
-#define mac68k_trunc_page(x)	((unsigned)(x) & ~PGOFSET)
-#define mac68k_btop(x)		((unsigned)(x) >> PGSHIFT)
-#define mac68k_ptob(x)		((unsigned)(x) << PGSHIFT)
-
-#include <machine/psl.h>
-
 #if defined(_KERNEL) && !defined(_LOCORE)
 void	delay		__P((unsigned));
 #define DELAY(ms)	delay(ms)
diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index 52597c3335a..859c5b15950 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.7 1998/03/07 07:27:45 gene Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.8 1999/04/24 06:39:40 downsj Exp $	*/
 /*	$NetBSD: pmap.h,v 1.14 1997/02/02 18:19:55 scottr Exp $	*/
 
 /*
@@ -129,7 +129,7 @@ typedef struct pmap	*pmap_t;
  */
 #define PMAP_ACTIVATE(pmapp, pcbp, iscurproc) \
 	if ((pmapp)->pm_stchanged) { \
-		(pcbp)->pcb_ustp = mac68k_btop((vm_offset_t)(pmapp)->pm_stpa); \
+		(pcbp)->pcb_ustp = m68k_btop((vm_offset_t)(pmapp)->pm_stpa); \
 		if (iscurproc) \
 			loadustp((pcbp)->pcb_ustp); \
 		(pmapp)->pm_stchanged = FALSE; \
diff --git a/sys/arch/mac68k/mac68k/bus_space.c b/sys/arch/mac68k/mac68k/bus_space.c
index f5fd543339e..d73639eefd3 100644
--- a/sys/arch/mac68k/mac68k/bus_space.c
+++ b/sys/arch/mac68k/mac68k/bus_space.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_space.c,v 1.2 1999/01/11 05:11:36 millert Exp $	*/
+/*	$OpenBSD: bus_space.c,v 1.3 1999/04/24 06:39:41 downsj Exp $	*/
 /*	$NetBSD: bus_space.c,v 1.2 1998/04/24 05:27:24 scottr Exp $	*/
 
 /*-
@@ -87,8 +87,8 @@ bus_space_map(t, bpa, size, flags, bshp)
 	if (error)
 		return (error);
 
-	pa = mac68k_trunc_page(bpa + t);
-	endpa = mac68k_round_page((bpa + t + size) - 1);
+	pa = m68k_trunc_page(bpa + t);
+	endpa = m68k_round_page((bpa + t + size) - 1);
 
 #ifdef DIAGNOSTIC
 	if (endpa <= pa)
@@ -166,8 +166,8 @@ bus_mem_add_mapping(bpa, size, flags, bshp)
 	u_long pa, endpa;
 	vm_offset_t va;
 
-	pa = mac68k_trunc_page(bpa);
-	endpa = mac68k_round_page((bpa + size) - 1);
+	pa = m68k_trunc_page(bpa);
+	endpa = m68k_round_page((bpa + size) - 1);
 
 #ifdef DIAGNOSTIC
 	if (endpa <= pa)
@@ -203,8 +203,8 @@ bus_space_unmap(t, bsh, size)
 	vm_offset_t	va, endva;
 	bus_addr_t bpa;
 
-	va = mac68k_trunc_page(bsh);
-	endva = mac68k_round_page((bsh + size) - 1);
+	va = m68k_trunc_page(bsh);
+	endva = m68k_round_page((bsh + size) - 1);
 
 #ifdef DIAGNOSTIC
 	if (endva <= va)
diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c
index 6191e4d943b..9f5f831581f 100644
--- a/sys/arch/mac68k/mac68k/mem.c
+++ b/sys/arch/mac68k/mac68k/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.6 1999/04/23 05:18:07 downsj Exp $	*/
+/*	$OpenBSD: mem.c,v 1.7 1999/04/24 06:39:41 downsj Exp $	*/
 /*	$NetBSD: mem.c,v 1.11 1996/05/05 06:18:41 briggs Exp $	*/
 
 /*
@@ -218,7 +218,7 @@ mmmmap(dev, off, prot)
 	 */
 	for (seg = 0; seg < numranges; seg++) {
 		if (((u_long)off >= low[seg]) && ((u_long)off <= high[seg]))
-			return (mac68k_btop(off));
+			return (m68k_btop(off));
 	}
 	return (-1);
 }
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 779445637f8..607de2e0566 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.11 1999/01/11 05:11:36 millert Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.12 1999/04/24 06:39:41 downsj Exp $	*/
 /*	$NetBSD: pmap.c,v 1.28 1996/10/21 05:42:27 scottr Exp $	*/
 
 /* 
@@ -331,7 +331,7 @@ pmap_bootstrap_alloc(size)
 		avail_start + size, VM_PROT_READ|VM_PROT_WRITE);
 	avail_start += size;
 
-	avail_remaining -= mac68k_btop (size);
+	avail_remaining -= m68k_btop (size);
 	/* XXX hope this doesn't pop it into the next range: */
 	avail_next += size;
 
@@ -361,7 +361,7 @@ pmap_init()
 	 */
 	addr = (vm_offset_t) IOBase;
 	(void) vm_map_find(kernel_map, NULL, (vm_offset_t) 0, &addr,
-			   mac68k_ptob(IIOMAPSIZE + ROMMAPSIZE + NBMAPSIZE),
+			   m68k_ptob(IIOMAPSIZE + ROMMAPSIZE + NBMAPSIZE),
 			   FALSE);
 	if (addr != (vm_offset_t)IOBase)
 		panic("pmap_init: I/O space not mapped!");
@@ -1100,7 +1100,7 @@ pmap_enter(pmap, va, pa, prot, wired)
 	if (!pmap_ste_v(pmap, va))
 		pmap_enter_ptpage(pmap, va);
 
-	pa = mac68k_trunc_page(pa);
+	pa = m68k_trunc_page(pa);
 	pte = pmap_pte(pmap, va);
 	opa = pmap_pte_pa(pte);
 #ifdef DEBUG
@@ -1644,7 +1644,7 @@ vm_offset_t
 pmap_phys_address(ppn)
 	int ppn;
 {
-	return(mac68k_ptob(ppn));
+	return(m68k_ptob(ppn));
 }
 
 /*
@@ -2373,12 +2373,12 @@ pmap_page_index(pa)
 	index = 0;
 	for (i = 0; i < numranges; i++) {
 		if (pa >= low[i] && pa < high[i]) {
-			index += mac68k_btop (pa - low[i]);
+			index += m68k_btop (pa - low[i]);
 			/* printf ("pmap_page_index(0x%x): returning %d\n", */
 				/* (int)pa, index); */
 			return index;
 		}
-		index += mac68k_btop (high[i] - low[i]);
+		index += m68k_btop (high[i] - low[i]);
 	}
 
 	return -1;
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index 7cbe7ed1820..1e15d469b2c 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_bootstrap.c,v 1.11 1999/04/23 05:15:28 downsj Exp $	*/
+/*	$OpenBSD: pmap_bootstrap.c,v 1.12 1999/04/24 06:39:41 downsj Exp $	*/
 /*	$NetBSD: pmap_bootstrap.c,v 1.30 1997/01/07 07:44:01 scottr Exp $	*/
 
 /* 
@@ -83,7 +83,7 @@ extern int		nbnumranges;
 extern u_long	nbphys[];
 extern u_long	nblog[];
 extern   signed long	nblen[];
-#define VIDMAPSIZE	btoc(mac68k_round_page(vidlen))
+#define VIDMAPSIZE	btoc(m68k_round_page(vidlen))
 extern u_int32_t	mac68k_vidlog;
 extern u_int32_t	mac68k_vidphys;
 extern u_int32_t	videoaddr;
@@ -338,8 +338,8 @@ pmap_bootstrap(nextpa, firstpa)
 	/*
 	 * Validate PTEs for kernel text (RO)
 	 */
-	pte = &(PA2VA(kptpa, u_int *))[mac68k_btop(KERNBASE)];
-	epte = &pte[mac68k_btop(mac68k_trunc_page(&etext))];
+	pte = &(PA2VA(kptpa, u_int *))[m68k_btop(KERNBASE)];
+	epte = &pte[m68k_btop(m68k_trunc_page(&etext))];
 #if defined(KGDB) || defined(DDB)
 	protopte = firstpa | PG_RW | PG_V;	/* XXX RW for now */
 #else
@@ -354,7 +354,7 @@ pmap_bootstrap(nextpa, firstpa)
 	 * by us so far (nextpa - firstpa bytes), and pages for proc0
 	 * u-area and page table allocated below (RW).
 	 */
-	epte = &(PA2VA(kptpa, u_int *))[mac68k_btop(nextpa - firstpa)];
+	epte = &(PA2VA(kptpa, u_int *))[m68k_btop(nextpa - firstpa)];
 	protopte = (protopte & ~PG_PROT) | PG_RW;
 	/*
 	 * Enable copy-back caching of data pages
@@ -413,17 +413,17 @@ pmap_bootstrap(nextpa, firstpa)
 	 * Sysmap: kernel page table (as mapped through Sysptmap)
 	 * Immediately follows `nptpages' of static kernel page table.
 	 */
-	Sysmap = (pt_entry_t *)mac68k_ptob(nptpages * NPTEPG);
+	Sysmap = (pt_entry_t *)m68k_ptob(nptpages * NPTEPG);
 
-	IOBase = (u_long)mac68k_ptob(nptpages*NPTEPG -
+	IOBase = (u_long)m68k_ptob(nptpages*NPTEPG -
 			(IIOMAPSIZE + ROMMAPSIZE + VIDMAPSIZE));
 
-	ROMBase = (char *)mac68k_ptob(nptpages*NPTEPG -
+	ROMBase = (char *)m68k_ptob(nptpages*NPTEPG -
 					(ROMMAPSIZE + VIDMAPSIZE));
 
 	if (vidlen) {
 		newvideoaddr = (u_int32_t)
-				mac68k_ptob(nptpages*NPTEPG - VIDMAPSIZE)
+				m68k_ptob(nptpages*NPTEPG - VIDMAPSIZE)
 				+ (mac68k_vidphys & PGOFSET);
 		if (mac68k_vidlog)
 			mac68k_vidlog = newvideoaddr;
@@ -450,7 +450,7 @@ pmap_bootstrap(nextpa, firstpa)
 	 * VM data structures are now initialized, set up data for
 	 * the pmap module.
 	 */
-	avail_next = avail_start = mac68k_round_page(nextpa);
+	avail_next = avail_start = m68k_round_page(nextpa);
 	avail_remaining = 0;
 	avail_range = -1;
 	for (i = 0; i < numranges; i++) {
@@ -461,9 +461,9 @@ pmap_bootstrap(nextpa, firstpa)
 			avail_remaining += (high[i] - low[i]);
 		}
 	}
-	physmem = mac68k_btop(avail_remaining + nextpa - firstpa);
-	avail_remaining -= mac68k_round_page(sizeof(struct msgbuf));
-	high[numranges - 1] -= mac68k_round_page(sizeof(struct msgbuf));
+	physmem = m68k_btop(avail_remaining + nextpa - firstpa);
+	avail_remaining -= m68k_round_page(sizeof(struct msgbuf));
+	high[numranges - 1] -= m68k_round_page(sizeof(struct msgbuf));
 
 	/* XXX -- this doesn't look correct to me. */
 	while (high[numranges - 1] < low[numranges - 1]) {
@@ -471,11 +471,11 @@ pmap_bootstrap(nextpa, firstpa)
 		high[numranges - 1] -= low[numranges] - high[numranges];
 	}
 
-	avail_remaining = mac68k_trunc_page(avail_remaining);
+	avail_remaining = m68k_trunc_page(avail_remaining);
 	avail_end = avail_start + avail_remaining;
-	avail_remaining = mac68k_btop(avail_remaining);
+	avail_remaining = m68k_btop(avail_remaining);
 
-	mem_size = mac68k_ptob(physmem);
+	mem_size = m68k_ptob(physmem);
 	virtual_avail = VM_MIN_KERNEL_ADDRESS + (nextpa - firstpa);
 	virtual_end = VM_MAX_KERNEL_ADDRESS;
 
@@ -592,7 +592,7 @@ bootstrap_mac68k(tc)
 	if (boothowto & RB_MINIROOT) {
 		int	v;
 		boothowto |= RB_DFLTROOT;
-		nextpa = mac68k_round_page(nextpa);
+		nextpa = m68k_round_page(nextpa);
 		if ((v = mfs_initminiroot((caddr_t) nextpa-load_addr)) == 0) {
 			printf("Error loading miniroot.\n");
 		}