d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFP4 #212266

Browse Source 
Fix compile on MIPS64.

Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2012-06-29 20:15:00 +00:00
parent a1ea9a8276
commit 9e81f117f9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/geom/geom_map.c
View File

@ -119,13 +119,13 @@ g_map_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
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 char *line, off_t *offset)
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, struct g_provider *pp,
}
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;