Module Name: src
Committed By: macallan
Date: Fri Sep 23 12:42:15 UTC 2011
Modified Files:
src/sys/arch/mips/mips: bus_space_alignstride_chipdep.c
Log Message:
make this build again with 32bit paddr_t
from he@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/sys/arch/mips/mips/bus_space_alignstride_chipdep.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/arch/mips/mips/bus_space_alignstride_chipdep.c
diff -u src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.17 src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.18
--- src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c:1.17 Fri Sep 23 12:34:52 2011
+++ src/sys/arch/mips/mips/bus_space_alignstride_chipdep.c Fri Sep 23 12:42:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $ */
+/* $NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.17 2011/09/23 12:34:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space_alignstride_chipdep.c,v 1.18 2011/09/23 12:42:15 macallan Exp $");
#ifdef CHIP_EXTENT
#include <sys/extent.h>
@@ -629,10 +629,12 @@
if (error)
return (-1);
ret = mbst.mbst_sys_start + (addr - mbst.mbst_bus_start) + off;
+#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
if (flags & BUS_SPACE_MAP_PREFETCHABLE) {
ret |= PGC_PREFETCH;
}
-
+#endif
+
return (mips_btop(ret));
#else
# error must define one of CHIP_IO or CHIP_MEM
