From owner-svn-src-all@FreeBSD.ORG  Sat Mar 10 06:43:42 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2AB4C1065673;
	Sat, 10 Mar 2012 06:43:42 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 19F168FC12;
	Sat, 10 Mar 2012 06:43:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2A6hf67043940;
	Sat, 10 Mar 2012 06:43:41 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2A6hfEp043938;
	Sat, 10 Mar 2012 06:43:41 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203100643.q2A6hfEp043938@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 10 Mar 2012 06:43:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232768 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Mar 2012 06:43:42 -0000

Author: jmallett
Date: Sat Mar 10 06:43:41 2012
New Revision: 232768
URL: http://svn.freebsd.org/changeset/base/232768

Log:
  Don't truncate physical addresses to 32-bits.

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

Modified: head/sys/mips/mips/nexus.c
==============================================================================
--- head/sys/mips/mips/nexus.c	Sat Mar 10 06:31:28 2012	(r232767)
+++ head/sys/mips/mips/nexus.c	Sat Mar 10 06:43:41 2012	(r232768)
@@ -383,11 +383,11 @@ nexus_activate_resource(device_t bus, de
     struct resource *r)
 {
 	void *vaddr;
-	u_int32_t paddr, psize;
-	
+	vm_paddr_t paddr;
+	vm_size_t psize;
+
 	/*
-	 * If this is a memory resource, track the direct mapping
-	 * in the uncached MIPS KSEG1 segment.
+	 * If this is a memory resource, use pmap_mapdev to map it.
 	 */
 	if (type == SYS_RES_MEMORY) {
 		paddr = rman_get_start(r);