From owner-svn-src-all@FreeBSD.ORG  Fri Mar 29 15:54:12 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D07D6F05;
 Fri, 29 Mar 2013 15:54:12 +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 C3508CE8;
 Fri, 29 Mar 2013 15:54:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TFsCSC042131;
 Fri, 29 Mar 2013 15:54:12 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TFsC88042130;
 Fri, 29 Mar 2013 15:54:12 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201303291554.r2TFsC88042130@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Fri, 29 Mar 2013 15:54:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248892 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Mar 2013 15:54:12 -0000

Author: jimharris
Date: Fri Mar 29 15:54:12 2013
New Revision: 248892
URL: http://svnweb.freebsd.org/changeset/base/248892

Log:
  Do not add 1 to nsegs before passing to CTR5(), since nsegs
  has already been incremented before these calls.
  
  Sponsored by:	Intel

Modified:
  head/sys/kern/subr_bus_dma.c

Modified: head/sys/kern/subr_bus_dma.c
==============================================================================
--- head/sys/kern/subr_bus_dma.c	Fri Mar 29 15:51:45 2013	(r248891)
+++ head/sys/kern/subr_bus_dma.c	Fri Mar 29 15:54:12 2013	(r248892)
@@ -282,7 +282,7 @@ bus_dmamap_load(bus_dma_tag_t dmat, bus_
 	nsegs++;
 
 	CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d",
-	    __func__, dmat, flags, error, nsegs + 1);
+	    __func__, dmat, flags, error, nsegs);
 
 	if (error == EINPROGRESS)
 		return (error);
@@ -359,7 +359,7 @@ bus_dmamap_load_uio(bus_dma_tag_t dmat, 
 		(*callback)(callback_arg, segs, nsegs, uio->uio_resid, error);
 
 	CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d",
-	    __func__, dmat, flags, error, nsegs + 1);
+	    __func__, dmat, flags, error, nsegs);
 	return (error);
 }
 
@@ -455,7 +455,7 @@ bus_dmamap_load_mem(bus_dma_tag_t dmat, 
 	nsegs++;
 
 	CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d",
-	    __func__, dmat, flags, error, nsegs + 1);
+	    __func__, dmat, flags, error, nsegs);
 
 	if (error == EINPROGRESS)
 		return (error);