From owner-p4-projects@FreeBSD.ORG  Mon Jun  4 16:10:44 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FF46106566B; Mon,  4 Jun 2012 16:10:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE2511065670
	for <perforce@freebsd.org>; Mon,  4 Jun 2012 16:10:43 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D73088FC08
	for <perforce@freebsd.org>; Mon,  4 Jun 2012 16:10:43 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q54GAhvJ077679
	for <perforce@freebsd.org>; Mon, 4 Jun 2012 16:10:43 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q54GAh1g077674
	for perforce@freebsd.org; Mon, 4 Jun 2012 16:10:43 GMT
	(envelope-from brooks@freebsd.org)
Date: Mon, 4 Jun 2012 16:10:43 GMT
Message-Id: <201206041610.q54GAh1g077674@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 212266 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 16:10:44 -0000

http://p4web.freebsd.org/@@212266?ac=10

Change 212266 by brooks@brooks_ecr_current on 2012/06/04 16:10:06

	Fix compile on MIPS64 (and presumably other 64-bit architectures)

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/geom/geom_map.c#2 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/geom/geom_map.c#2 (text+ko) ====

@@ -119,13 +119,13 @@
 	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 @@
 		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 @@
 	}
 
 	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;