Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Dec 2012 21:09:39 +0000 (UTC)
From:      Jeff Roberson <jeff@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r244913 - in projects/physbio/sys: arm/arm sparc64/sparc64
Message-ID:  <201212312109.qBVL9dOc007913@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212312109.qBVL9dOc007913>