From owner-svn-src-projects@FreeBSD.ORG  Mon Dec 31 21:09:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 531DEC5;
 Mon, 31 Dec 2012 21:09:40 +0000 (UTC)
 (envelope-from jeff@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 386A18FC14;
 Mon, 31 Dec 2012 21:09:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVL9ew9007915;
 Mon, 31 Dec 2012 21:09:40 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVL9dOc007913;
 Mon, 31 Dec 2012 21:09:39 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201212312109.qBVL9dOc007913@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Mon, 31 Dec 2012 21:09:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244913 - in projects/physbio/sys: arm/arm sparc64/sparc64
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Dec 2012 21:09:40 -0000

Author: jeff
Date: Mon Dec 31 21:09:39 2012
New Revision: 244913
URL: http://svnweb.freebsd.org/changeset/base/244913

Log:
   - Fix two compile errors found post merge.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  projects/physbio/sys/arm/arm/busdma_machdep.c
  projects/physbio/sys/sparc64/sparc64/bus_machdep.c

Modified: projects/physbio/sys/arm/arm/busdma_machdep.c
==============================================================================
--- projects/physbio/sys/arm/arm/busdma_machdep.c	Mon Dec 31 21:00:38 2012	(r244912)
+++ projects/physbio/sys/arm/arm/busdma_machdep.c	Mon Dec 31 21:09:39 2012	(r244913)
@@ -687,6 +687,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
 	struct sync_list *slist;
 	void * vaddr;
 	struct busdma_bufzone *bufzone;
+	busdma_bufalloc_t ba;
 	bus_dmamap_t map;
 	int mflags;
 	vm_memattr_t memattr;

Modified: projects/physbio/sys/sparc64/sparc64/bus_machdep.c
==============================================================================
--- projects/physbio/sys/sparc64/sparc64/bus_machdep.c	Mon Dec 31 21:00:38 2012	(r244912)
+++ projects/physbio/sys/sparc64/sparc64/bus_machdep.c	Mon Dec 31 21:09:39 2012	(r244913)
@@ -385,7 +385,7 @@ nexus_dmamap_load_phys(bus_dma_tag_t dma
 
 	curaddr = buf;
 	while (buflen > 0) {
-		sgsize = MIN(buflen, dmat->maxsegsz);
+		sgsize = MIN(buflen, dmat->dt_maxsegsz);
 		sgsize = nexus_dmamap_addseg(dmat, map, curaddr, sgsize, segs,
 		    segp);
 		if (sgsize == 0)