svn commit: r237820 - head/sys/geom

[Brooks Davis]

Author: brooks
Date: Fri Jun 29 20:15:00 2012
New Revision: 237820
URL: http://svn.freebsd.org/changeset/base/237820

Log:
  MFP4 #212266
  
  Fix compile on MIPS64.
  
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/geom/geom_map.c

Modified: head/sys/geom/geom_map.c
==============================================================================
--- head/sys/geom/geom_map.c    Fri Jun 29 19:51:06 2012        (r237819)
+++ head/sys/geom/geom_map.c    Fri Jun 29 20:15:00 2012        (r237820)
@@ -119,13 +119,13 @@ g_map_dumpconf(struct sbuf *sb, const ch
        g_slice_dumpconf(sb, indent, gp, cp, pp);
        if (pp != NULL) {
                if (indent == NULL) {
-                       sbuf_printf(sb, " entry %lld", sc->entry[pp->index]);
-                       sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]);
+                       sbuf_printf(sb, " entry %jd", 
(intmax_t)sc->entry[pp->index]);
+                       sbuf_printf(sb, " dsize %jd", 
(intmax_t)sc->dsize[pp->index]);
                } else {
-                       sbuf_printf(sb, "%s<entry>%lld</entry>\n", indent,
-                           sc->entry[pp->index]);
-                       sbuf_printf(sb, "%s<dsize>%lld</dsize>\n", indent,
-                           sc->dsize[pp->index]);
+                       sbuf_printf(sb, "%s<entry>%jd</entry>\n", indent,
+                           (intmax_t)sc->entry[pp->index]);
+                       sbuf_printf(sb, "%s<dsize>%jd</dsize>\n", indent,
+                           (intmax_t)sc->dsize[pp->index]);
                }
        }
 }
@@ -153,8 +153,8 @@ find_marker(struct g_consumer *cp, const
                return (1);
 
        if (bootverbose) {
-               printf("MAP: search key \"%s\" from 0x%llx, step 0x%llx\n",
-                   search_key, search_start, search_step);
+               printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n",
+                   search_key, (intmax_t)search_start, (intmax_t)search_step);
        }
 
        /* error if search_key is empty */
@@ -321,9 +321,10 @@ g_map_parse_part(struct g_class *mp, str
        }
 
        if (bootverbose) {
-               printf("MAP: %llxx%llx, data=%llxx%llx "
+               printf("MAP: %lxx%lx, data=%lxx%lx "
                    "\"/dev/map/%s\"\n",
-                   start, size, offset, dsize, name);
+                   (intmax_t)start, (intmax_t)size, (intmax_t)offset,
+                   (intmax_t)dsize, name);
        }
 
        sc->offset[i] = start;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"