From owner-svn-src-all@FreeBSD.ORG  Fri Jun 29 20:15:01 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1047B106566B;
	Fri, 29 Jun 2012 20:15:01 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB3138FC15;
	Fri, 29 Jun 2012 20:15:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TKF0S2068022;
	Fri, 29 Jun 2012 20:15:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TKF0bw068017;
	Fri, 29 Jun 2012 20:15:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201206292015.q5TKF0bw068017@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 29 Jun 2012 20:15:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237820 - head/sys/geom
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 20:15:01 -0000

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;