From owner-svn-src-head@FreeBSD.ORG  Fri Feb 15 23:41:48 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 88E3D33C;
 Fri, 15 Feb 2013 23:41:48 +0000 (UTC) (envelope-from ian@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 7684DE0F;
 Fri, 15 Feb 2013 23:41:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1FNfmNN047316;
 Fri, 15 Feb 2013 23:41:48 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1FNfmcA047314;
 Fri, 15 Feb 2013 23:41:48 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201302152341.r1FNfmcA047314@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 15 Feb 2013 23:41:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246859 - head/sys/arm/arm
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: Fri, 15 Feb 2013 23:41:48 -0000

Author: ian
Date: Fri Feb 15 23:41:47 2013
New Revision: 246859
URL: http://svnweb.freebsd.org/changeset/base/246859

Log:
  Set map->pmap before _bus_dmamap_count_pages() tries to use it.
  
  Obtained from:	Thomas Skibo <ThomasSkibo@sbcglobal.net>

Modified:
  head/sys/arm/arm/busdma_machdep-v6.c

Modified: head/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep-v6.c	Fri Feb 15 23:12:58 2013	(r246858)
+++ head/sys/arm/arm/busdma_machdep-v6.c	Fri Feb 15 23:41:47 2013	(r246859)
@@ -968,6 +968,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 	if (segs == NULL)
 		segs = dmat->segments;
 
+	map->pmap = pmap;
+
 	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_pages(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
@@ -979,7 +981,6 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 
 	sl = NULL;
 	vaddr = (vm_offset_t)buf;
-	map->pmap = pmap;
 
 	while (buflen > 0) {
 		/*