Author: obrien
Date: Thu Mar 7 22:54:28 2013
New Revision: 247963
URL: http://svnweb.freebsd.org/changeset/base/247963
Log:
Fix GCC build:
/usr/src/sys/modules/nvme/../../dev/nvme/nvme.c:211: warning: format '%qx'
expects type 'long unsigned int', but argument 9 has type 'long long unsigned
int' [-Wformat]
Modified:
head/sys/dev/nvme/nvme.c
head/sys/dev/nvme/nvme_ctrlr.c
Modified: head/sys/dev/nvme/nvme.c
==============================================================================
--- head/sys/dev/nvme/nvme.c Thu Mar 7 22:43:50 2013 (r247962)
+++ head/sys/dev/nvme/nvme.c Thu Mar 7 22:54:28 2013 (r247963)
@@ -200,13 +200,11 @@ nvme_modevent(module_t mod, int type, vo
void
nvme_dump_command(struct nvme_command *cmd)
{
- printf("opc:%x f:%x r1:%x cid:%x nsid:%x r2:%x r3:%x "
- "mptr:%qx prp1:%qx prp2:%qx cdw:%x %x %x %x %x %x\n",
+ printf(
+"opc:%x f:%x r1:%x cid:%x nsid:%x r2:%x r3:%x mptr:%jx prp1:%jx prp2:%jx
cdw:%x %x %x %x %x %x\n",
cmd->opc, cmd->fuse, cmd->rsvd1, cmd->cid, cmd->nsid,
cmd->rsvd2, cmd->rsvd3,
- (long long unsigned int)cmd->mptr,
- (long long unsigned int)cmd->prp1,
- (long long unsigned int)cmd->prp2,
+ (uintmax_t)cmd->mptr, (uintmax_t)cmd->prp1, (uintmax_t)cmd->prp2,
cmd->cdw10, cmd->cdw11, cmd->cdw12, cmd->cdw13, cmd->cdw14,
cmd->cdw15);
}
Modified: head/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- head/sys/dev/nvme/nvme_ctrlr.c Thu Mar 7 22:43:50 2013
(r247962)
+++ head/sys/dev/nvme/nvme_ctrlr.c Thu Mar 7 22:54:28 2013
(r247963)
@@ -131,8 +131,8 @@ nvme_ctrlr_setup_chatham(struct nvme_con
ctrlr->chatham_lbas = chatham_read_4(ctrlr, 0x8068) - 0x110;
ctrlr->chatham_size = ctrlr->chatham_lbas * 512;
- device_printf(ctrlr->dev, "Chatham size: %lld\n",
- (long long)ctrlr->chatham_size);
+ device_printf(ctrlr->dev, "Chatham size: %jd\n",
+ (intmax_t)ctrlr->chatham_size);
reg1 = reg2 = reg3 = ctrlr->chatham_size - 1;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
