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

Fix GCC build:

Browse Source 
/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]
This commit is contained in:
obrien 2013-03-07 22:54:28 +00:00
parent 24bac1724c
commit 8f87944624
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/nvme/nvme.c
View File

@ -200,13 +200,11 @@ nvme_modevent(module_t mod, int type, void *arg)
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);
}

4
sys/dev/nvme/nvme_ctrlr.c
View File

@ -131,8 +131,8 @@ nvme_ctrlr_setup_chatham(struct nvme_controller *ctrlr)
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;