Module Name: src
Committed By: macallan
Date: Fri Jan 29 23:50:01 UTC 2010
Modified Files:
src/sys/dev/sbus: agten.c
Log Message:
avoid using PAGE_SIZE directly so sparc/GENERIC builds again
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/sbus/agten.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/agten.c
diff -u src/sys/dev/sbus/agten.c:1.23 src/sys/dev/sbus/agten.c:1.24
--- src/sys/dev/sbus/agten.c:1.23 Wed Jan 27 21:02:22 2010
+++ src/sys/dev/sbus/agten.c Fri Jan 29 23:50:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.23 2010/01/27 21:02:22 macallan Exp $ */
+/* $NetBSD: agten.c,v 1.24 2010/01/29 23:50:01 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.23 2010/01/27 21:02:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.24 2010/01/29 23:50:01 macallan Exp $");
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -74,7 +74,7 @@
#include <dev/ic/i128reg.h>
#include <dev/ic/i128var.h>
-#include <machine/vmparam.h>
+#include <uvm/uvm_extern.h>
#include "opt_agten.h"
#include "ioconf.h"
@@ -248,7 +248,7 @@
sc->sc_i128_fbsz = prom_getpropint(node, "i128_fb_size", -1);
if (sbus_bus_map(sc->sc_bustag,
sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base + reg,
- (sc->sc_stride * sc->sc_height + PAGE_MASK) & ~PAGE_MASK,
+ round_page(sc->sc_stride * sc->sc_height),
BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
&sc->sc_i128_fbh) != 0) {
