From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 20 16:27:50 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D99771065679;
	Fri, 20 Nov 2009 16:27:50 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C91FE8FC08;
	Fri, 20 Nov 2009 16:27:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAKGRoAO049796;
	Fri, 20 Nov 2009 16:27:50 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAKGRoeC049794;
	Fri, 20 Nov 2009 16:27:50 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911201627.nAKGRoeC049794@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 20 Nov 2009 16:27:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199597 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 20 Nov 2009 16:27:50 -0000

Author: imp
Date: Fri Nov 20 16:27:50 2009
New Revision: 199597
URL: http://svn.freebsd.org/changeset/base/199597

Log:
  cast vaddr to uintptr_t before casting it to a bus_space_handle_t.
  
  # I'm sure this indicates a problem, but I'm not sure what...

Modified:
  projects/mips/sys/mips/mips/nexus.c

Modified: projects/mips/sys/mips/mips/nexus.c
==============================================================================
--- projects/mips/sys/mips/mips/nexus.c	Fri Nov 20 16:23:04 2009	(r199596)
+++ projects/mips/sys/mips/mips/nexus.c	Fri Nov 20 16:27:50 2009	(r199597)
@@ -404,6 +404,7 @@ nexus_activate_resource(device_t bus, de
 	 * If this is a memory resource, track the direct mapping
 	 * in the uncached MIPS KSEG1 segment.
 	 */
+	/* XXX we shouldn't be supporting sys_res_ioport here */
 	if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) {
 		caddr_t vaddr = 0;
 		u_int32_t paddr;
@@ -417,7 +418,7 @@ nexus_activate_resource(device_t bus, de
 
 		rman_set_virtual(r, vaddr);
 		rman_set_bustag(r, mips_bus_space_generic);
-		rman_set_bushandle(r, (bus_space_handle_t)vaddr);
+		rman_set_bushandle(r, (bus_space_handle_t)(uintptr_t)vaddr);
 	}
 
 	return (rman_activate_resource(r));