Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips make this build again with 32bit paddr_t



details:   https://anonhg.NetBSD.org/src/rev/b1ed1198d13c
branches:  trunk
changeset: 769787:b1ed1198d13c
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Sep 23 12:42:15 2011 +0000

description:
make this build again with 32bit paddr_t
from he@

diffstat:

 sys/arch/mips/mips/bus_space_alignstride_chipdep.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 83a025385564 -r b1ed1198d13c sys/arch/mips/mips/bus_space_alignstride_chipdep.c
--- a/sys/arch/mips/mips/bus_space_alignstride_chipdep.c        Fri Sep 23 12:34:52 2011 +0000
+++ b/sys/arch/mips/mips/bus_space_alignstride_chipdep.c        Fri Sep 23 12:42:15 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index