From owner-svn-src-head@FreeBSD.ORG  Fri Aug  9 21:56:29 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4577F6FA;
 Fri,  9 Aug 2013 21:56:29 +0000 (UTC)
 (envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31448254D;
 Fri,  9 Aug 2013 21:56:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79LuTJa044103;
 Fri, 9 Aug 2013 21:56:29 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79LuTQU044102;
 Fri, 9 Aug 2013 21:56:29 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201308092156.r79LuTQU044102@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Fri, 9 Aug 2013 21:56:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254165 - 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, 09 Aug 2013 21:56:29 -0000

Author: cognet
Date: Fri Aug  9 21:56:28 2013
New Revision: 254165
URL: http://svnweb.freebsd.org/changeset/base/254165

Log:
  - The address lies in the bus space handle, not in the cookie
  - Use the right address when calling kva_free()

Modified:
  head/sys/arm/arm/bus_space_generic.c

Modified: head/sys/arm/arm/bus_space_generic.c
==============================================================================
--- head/sys/arm/arm/bus_space_generic.c	Fri Aug  9 21:53:02 2013	(r254164)
+++ head/sys/arm/arm/bus_space_generic.c	Fri Aug  9 21:56:28 2013	(r254165)
@@ -104,21 +104,21 @@ generic_bs_alloc(void *t, bus_addr_t rst
 void
 generic_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size)
 {
-	vm_offset_t va, endva;
+	vm_offset_t va, endva, origva;
 
-	if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) {
+	if (pmap_devmap_find_va((vm_offset_t)h, size) != NULL) {
 		/* Device was statically mapped; nothing to do. */
 		return;
 	}
 
-	endva = round_page((vm_offset_t)t + size);
-	va = trunc_page((vm_offset_t)t);
+	endva = round_page((vm_offset_t)h + size);
+	origva = va = trunc_page((vm_offset_t)h);
 
 	while (va < endva) {
 		pmap_kremove(va);
 		va += PAGE_SIZE;
 	}
-	kva_free(va, endva - va);
+	kva_free(origva, endva - origva);
 }
 
 void