From owner-svn-src-head@FreeBSD.ORG  Wed Mar 27 00:37:01 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1E568BCD;
 Wed, 27 Mar 2013 00:37:01 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 02D7D1AF;
 Wed, 27 Mar 2013 00:37:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2R0b0XU076951;
 Wed, 27 Mar 2013 00:37:00 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2R0b0Qa076950;
 Wed, 27 Mar 2013 00:37:00 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201303270037.r2R0b0Qa076950@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 27 Mar 2013 00:37:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248780 - head/sys/dev/nvme
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2013 00:37:01 -0000

Author: jimharris
Date: Wed Mar 27 00:37:00 2013
New Revision: 248780
URL: http://svnweb.freebsd.org/changeset/base/248780

Log:
  Fix printf format issue on i386.
  
  Reported by:	bz

Modified:
  head/sys/dev/nvme/nvme_qpair.c

Modified: head/sys/dev/nvme/nvme_qpair.c
==============================================================================
--- head/sys/dev/nvme/nvme_qpair.c	Wed Mar 27 00:35:45 2013	(r248779)
+++ head/sys/dev/nvme/nvme_qpair.c	Wed Mar 27 00:37:00 2013	(r248780)
@@ -125,9 +125,10 @@ nvme_io_qpair_print_command(struct nvme_
 	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: