From owner-svn-src-user@FreeBSD.ORG  Sat Mar 27 23:58:54 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68845106566C;
	Sat, 27 Mar 2010 23:58:54 +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 229728FC0A;
	Sat, 27 Mar 2010 23:58:54 +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 o2RNwsX4039002;
	Sat, 27 Mar 2010 23:58:54 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2RNwsgS039000;
	Sat, 27 Mar 2010 23:58:54 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003272358.o2RNwsgS039000@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 27 Mar 2010 23:58:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205780 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Mar 2010 23:58:54 -0000

Author: jmallett
Date: Sat Mar 27 23:58:53 2010
New Revision: 205780
URL: http://svn.freebsd.org/changeset/base/205780

Log:
  Use the direct map in pmap_map where possible.

Modified:
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Sat Mar 27 23:57:38 2010	(r205779)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Sat Mar 27 23:58:53 2010	(r205780)
@@ -751,8 +751,15 @@ pmap_kremove(vm_offset_t va)
 vm_offset_t
 pmap_map(vm_offset_t *virt, vm_offset_t start, vm_offset_t end, int prot)
 {
+#if defined(__mips_n64)
+	return (MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_CCA_CNC, start));
+#else
 	vm_offset_t va, sva;
 
+	if (end <= MIPS_KSEG0_LARGEST_PHYS) {
+		return (MIPS_PHYS_TO_KSEG0(start));
+	}
+
 	va = sva = *virt;
 	while (start < end) {
 		pmap_kenter(va, start);
@@ -761,6 +768,7 @@ pmap_map(vm_offset_t *virt, vm_offset_t 
 	}
 	*virt = va;
 	return (sva);
+#endif
 }
 
 /*