Use MI {trunc,round}_page macros.

5 files changed, 16 insertions, 16 deletions

diff --git a/sys/arch/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c
index 740e67237df..c0b6f3051b3 100644
--- a/sys/arch/sun3/sun3/autoconf.c
+++ b/sys/arch/sun3/sun3/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.11 2001/05/30 20:37:54 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.12 2001/06/11 01:30:13 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $	*/
 
 /*-
@@ -275,7 +275,7 @@ bus_mapin(bustype, paddr, sz)
 	off = paddr & PGOFSET;
 	pa = paddr - off;
 	sz += off;
-	sz = m68k_round_page(sz);
+	sz = round_page(sz);
 
 	pmt = bustype_to_pmaptype[bustype];
 	pmt |= PMAP_NC;	/* non-cached */
diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c
index 6c6c1b52db7..684947d043d 100644
--- a/sys/arch/sun3/sun3/db_memrw.c
+++ b/sys/arch/sun3/sun3/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_memrw.c,v 1.7 1997/09/07 14:05:20 kstailey Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.8 2001/06/11 01:30:13 miod Exp $	*/
 /*	$NetBSD: db_memrw.c,v 1.13 1996/11/20 18:57:28 gwr Exp $	*/
 
 /*-
@@ -117,7 +117,7 @@ db_write_text(addr, size, data)
 		return;
 
 	dst = (char*)addr;
-	pgva = m68k_trunc_page((long)dst);
+	pgva = trunc_page((long)dst);
 
 	goto firstpage;
 	do {
@@ -127,7 +127,7 @@ db_write_text(addr, size, data)
 		 * for the previous page, and make the new
 		 * page writable.
 		 */
-		pgva = m68k_trunc_page((long)dst);
+		pgva = trunc_page((long)dst);
 		if (pgva != prevpg) {
 			/*
 			 * Restore old PTE.  No cache flush,
diff --git a/sys/arch/sun3/sun3/dvma.c b/sys/arch/sun3/sun3/dvma.c
index bbc73953a2d..b67cc92a228 100644
--- a/sys/arch/sun3/sun3/dvma.c
+++ b/sys/arch/sun3/sun3/dvma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvma.c,v 1.9 2001/05/30 20:40:03 miod Exp $	*/
+/*	$OpenBSD: dvma.c,v 1.10 2001/06/11 01:30:13 miod Exp $	*/
 /*	$NetBSD: dvma.c,v 1.5 1996/11/20 18:57:29 gwr Exp $	*/
 
 /*-
@@ -131,7 +131,7 @@ dvma_malloc(bytes)
 
     if (!bytes)
 		return NULL;
-    new_size = m68k_round_page(bytes);
+    new_size = round_page(bytes);
 #ifdef UVM
     new_mem = (caddr_t) uvm_km_alloc(phys_map, new_size);
 #else
@@ -151,7 +151,7 @@ dvma_free(addr, size)
 	caddr_t	addr;
 	size_t	size;
 {
-	vm_size_t sz = m68k_round_page(size);
+	vm_size_t sz = round_page(size);
 
 #ifdef UVM
 	uvm_km_free(phys_map, (vm_offset_t)addr, sz);
diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c
index cd2dab4d32d..6385b6b1ed3 100644
--- a/sys/arch/sun3/sun3/pmap.c
+++ b/sys/arch/sun3/sun3/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.24 2001/06/08 08:09:29 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.25 2001/06/11 01:30:13 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.64 1996/11/20 18:57:35 gwr Exp $	*/
 
 /*-
@@ -1551,7 +1551,7 @@ pmap_next_page(paddr)
 {
 	/* Is it time to skip over the hole? */
 	if (avail_next == hole_start)
-		avail_next += m68k_round_page(hole_size);
+		avail_next += round_page(hole_size);
 
 	/* Any available memory remaining? */
 	if (avail_next >= avail_end)
diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c
index 05a76c1fbfc..bc472f2bdfd 100644
--- a/sys/arch/sun3/sun3/sun3_startup.c
+++ b/sys/arch/sun3/sun3/sun3_startup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sun3_startup.c,v 1.15 2001/05/30 20:35:43 miod Exp $	*/
+/*	$OpenBSD: sun3_startup.c,v 1.16 2001/06/11 01:30:13 miod Exp $	*/
 /*	$NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $	*/
 
 /*-
@@ -383,9 +383,9 @@ sun3_vm_init(kehp)
 	esym = end;
 	/* This will advance esym past the symbols. */
 	sun3_save_symtab(kehp);
-	virtual_avail = m68k_round_page(esym);
+	virtual_avail = round_page(esym);
 #else
-	virtual_avail = m68k_round_page(end);
+	virtual_avail = round_page(end);
 #endif
 	virtual_end = VM_MAX_KERNEL_ADDRESS;
 
@@ -403,7 +403,7 @@ sun3_vm_init(kehp)
 		/* PROM version 1 or later. */
 		avail_end = *romp->memoryAvail;
 	}
-	avail_end = m68k_trunc_page(avail_end);
+	avail_end = trunc_page(avail_end);
 
 	/*
 	 * Steal some special-purpose, already mapped pages.
@@ -579,7 +579,7 @@ sun3_vm_init(kehp)
 
 	/* text */
 	va = (vm_offset_t) kernel_text;
-	eva = m68k_trunc_page(etext);
+	eva = trunc_page(etext);
 	while (va < eva) {
 		pte = get_pte(va);
 		if ((pte & (PG_VALID|PG_TYPE)) != PG_VALID) {
@@ -593,7 +593,7 @@ sun3_vm_init(kehp)
 	}
 
 	/* data and bss */
-	eva = m68k_round_page(end);
+	eva = round_page(end);
 	while (va < eva) {
 		pte = get_pte(va);
 		if ((pte & (PG_VALID|PG_TYPE)) != PG_VALID) {