[src/netbsd-1-6]: src/sys/arch/sparc64/dev Pull up revision 1.61 (via patch, ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41b614576344
branches:  netbsd-1-6
changeset: 529301:41b614576344
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 08 09:24:57 2002 +0000

description:
Pull up revision 1.61 (via patch, requested by martin in ticket #916):
Make 32bit sparc64 kernels with DEBUG and DIAGNOSTIC compile.

diffstat:

 sys/arch/sparc64/dev/iommu.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 4a1cb7a804f2 -r 41b614576344 sys/arch/sparc64/dev/iommu.c
--- a/sys/arch/sparc64/dev/iommu.c      Fri Nov 08 08:50:42 2002 +0000
+++ b/sys/arch/sparc64/dev/iommu.c      Fri Nov 08 09:24:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommu.c,v 1.51.4.4 2002/06/24 22:59:48 lukem Exp $     */
+/*     $NetBSD: iommu.c,v 1.51.4.5 2002/11/08 09:24:57 tron Exp $      */
 
 /*
  * Copyright (c) 2001, 2002 Eduardo Horvath
@@ -502,13 +502,13 @@
        sgend = sgstart + buflen - 1;
        map->dm_segs[seg].ds_addr = sgstart;
        DPRINTF(IDB_INFO, ("iommu_dvmamap_load: boundary %lx boundary-1 %lx "
-               "~(boundary-1) %lx\n", boundary, (boundary-1), ~(boundary-1)));
+               "~(boundary-1) %lx\n", (long)boundary, (long)(boundary-1), (long)~(boundary-1)));
        while ((sgstart & ~(boundary - 1)) != (sgend & ~(boundary - 1))) {
                /* Oops.  We crossed a boundary.  Split the xfer. */
                DPRINTF(IDB_INFO, ("iommu_dvmamap_load: "
                        "seg %d start %lx size %lx\n", seg,
                        (long)map->dm_segs[seg].ds_addr, 
-                       map->dm_segs[seg].ds_len));
+                       (long)map->dm_segs[seg].ds_len));
                map->dm_segs[seg].ds_len =
                    boundary - (sgstart & (boundary - 1));
                if (++seg >= map->_dm_segcnt) {
@@ -530,7 +530,7 @@
        map->dm_segs[seg].ds_len = sgend - sgstart + 1;
        DPRINTF(IDB_INFO, ("iommu_dvmamap_load: "
                "seg %d start %lx size %lx\n", seg,
-               (long)map->dm_segs[seg].ds_addr, map->dm_segs[seg].ds_len));
+               (long)map->dm_segs[seg].ds_addr, (long)map->dm_segs[seg].ds_len));
        map->dm_nsegs = seg+1;
        map->dm_mapsize = buflen;
 
@@ -733,7 +733,7 @@
 
                        DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: converting "
                                "physseg %d start %lx size %lx\n", i, 
-                               (long)segs[i].ds_addr, segs[i].ds_len));
+                               (long)segs[i].ds_addr, (long)segs[i].ds_len));
 
                        if ((pa == prev_pa) && 
                                ((offset != 0) || (end != offset))) {
@@ -752,7 +752,7 @@
                                DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: "
                                        "appending seg %d start %lx size %lx\n", j,
                                        (long)map->dm_segs[j].ds_addr, 
-                                       map->dm_segs[j].ds_len));
+                                       (long)map->dm_segs[j].ds_len));
                        } else {
                                if (j >= map->_dm_segcnt) {
                                        iommu_dvmamap_unload(t, sb, map);
@@ -763,7 +763,7 @@
                                DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: "
                                        "seg %d start %lx size %lx\n", j,
                                        (long)map->dm_segs[j].ds_addr,
-                                       map->dm_segs[j].ds_len));
+                                       (long)map->dm_segs[j].ds_len));
                        }
                        end = (offset + left) & PGOFSET;
 
@@ -776,7 +776,7 @@
                                DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: "
                                        "seg %d start %lx size %lx\n", j,
                                        (long)map->dm_segs[j].ds_addr, 
-                                       map->dm_segs[j].ds_len));
+                                       (long)map->dm_segs[j].ds_len));
                                if (++j >= map->_dm_segcnt) {
                                        iommu_dvmamap_unload(t, sb, map);
                                        return (E2BIG);
@@ -840,7 +840,7 @@
                DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: "
                        "seg %d start %lx size %lx\n", i,
                        (long)map->dm_segs[i].ds_addr,
-                       map->dm_segs[i].ds_len));
+                       (long)map->dm_segs[i].ds_len));
                if (++i >= map->_dm_segcnt) {
                        /* Too many segments.  Fail the operation. */
                        s = splhigh();
@@ -857,7 +857,7 @@
        }
        DPRINTF(IDB_INFO, ("iommu_dvmamap_load_raw: "
                        "seg %d start %lx size %lx\n", i,
-                       (long)map->dm_segs[i].ds_addr, map->dm_segs[i].ds_len));
+                       (long)map->dm_segs[i].ds_addr, (long)map->dm_segs[i].ds_len));
        map->dm_segs[i].ds_len = sgend - sgstart + 1;
 
        for (m = TAILQ_FIRST(mlist); m != NULL; m = TAILQ_NEXT(m,pageq)) {