roundup(foo, NBPG) -> round_page(foo)

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index f8cd679af4f..d44dacf89ae 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfourteen.c,v 1.3 1999/04/22 16:52:47 art Exp $	*/
+/*	$OpenBSD: cgfourteen.c,v 1.4 1999/09/10 23:32:01 art Exp $	*/
 /*	$NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
 
 /*
@@ -204,8 +204,8 @@ cgfourteenattach(parent, self, args)
 	fb_setsize(&sc->sc_fb, sc->sc_fb.fb_type.fb_depth,
 	    1152, 900, node, ca->ca_bustype);
 
-	ramsize = roundup(sc->sc_fb.fb_type.fb_height * sc->sc_fb.fb_linebytes,
-		NBPG);
+	ramsize = round_page(sc->sc_fb.fb_type.fb_height *
+			     sc->sc_fb.fb_linebytes);
 
 	sc->sc_fb.fb_type.fb_cmsize = CG14_CLUT_SIZE;
 	sc->sc_fb.fb_type.fb_size = ramsize;
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index 888432bee1a..a5026666090 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.8 1998/11/20 15:57:22 deraadt Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.9 1999/09/10 23:32:02 art Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -209,8 +209,8 @@ cgthreeattach(parent, self, args)
 		nam = "cgRDI";
 	}
 
-	ramsize = roundup(sc->sc_fb.fb_type.fb_height * sc->sc_fb.fb_linebytes,
-		NBPG);
+	ramsize = round_page(sc->sc_fb.fb_type.fb_height *
+			     sc->sc_fb.fb_linebytes);
 	sc->sc_fb.fb_type.fb_cmsize = 256;
 	sc->sc_fb.fb_type.fb_size = ramsize;
 	printf(": %s, %d x %d", nam,
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index 1c547175423..70fbc0b76b6 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.12 1998/11/20 15:57:22 deraadt Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.13 1999/09/10 23:32:02 art Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -189,7 +189,7 @@ cgtwoattach(parent, self, args)
 	    1152, 900, node, ca->ca_bustype);
 
 	sc->sc_fb.fb_type.fb_cmsize = 256;
-	sc->sc_fb.fb_type.fb_size = roundup(CG2_MAPPED_SIZE, NBPG);
+	sc->sc_fb.fb_type.fb_size = round_page(CG2_MAPPED_SIZE);
 	printf(": %s, %d x %d", nam,
 	    sc->sc_fb.fb_type.fb_width, sc->sc_fb.fb_type.fb_height);
 
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c
index 0ddb4505034..937429112ae 100644
--- a/sys/arch/sparc/dev/dma.c
+++ b/sys/arch/sparc/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.15 1999/07/09 21:34:44 art Exp $	*/
+/*	$OpenBSD: dma.c,v 1.16 1999/09/10 23:32:02 art Exp $	*/
 /*	$NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */
 
 /*
@@ -468,7 +468,7 @@ dma_setup(sc, addr, len, datain, dmasize)
 		long bcnt = sc->sc_dmasize;
 		long eaddr = bcnt + (long)*sc->sc_dmaaddr;
 		if ((eaddr & PGOFSET) != 0)
-			bcnt = roundup(bcnt, NBPG);
+			bcnt = round_page(bcnt);
 		DMACNT(sc) = bcnt;
 	}
 	/* Setup DMA control register */