From bdd1fd402cee27832332e893a6b683424fd882d3 Mon Sep 17 00:00:00 2001
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 27 Mar 2013 00:37:00 +0000
Subject: [PATCH] Fix printf format issue on i386.

Reported by:	bz
---
 sys/dev/nvme/nvme_qpair.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index 1e7644740a3..2deb4b9c564 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -125,9 +125,10 @@ nvme_io_qpair_print_command(struct nvme_qpair *qpair,
 	case NVME_OPC_WRITE_UNCORRECTABLE:
 	case NVME_OPC_COMPARE:
 		nvme_printf(qpair->ctrlr, "%s sqid:%d cid:%d nsid:%d "
-		    "lba:%lu len:%d\n",
+		    "lba:%llu len:%d\n",
 		    get_io_opcode_string(cmd->opc), qpair->id, cmd->cid,
-		    cmd->nsid, ((uint64_t)cmd->cdw11 << 32) | cmd->cdw10,
+		    cmd->nsid,
+		    ((unsigned long long)cmd->cdw11 << 32) + cmd->cdw10,
 		    (cmd->cdw12 & 0xFFFF) + 1);
 		break;
 	case NVME_OPC_FLUSH: