svn commit: r205780 - user/jmallett/octeon/sys/mips/mips

[Juli Mallett]

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
 }
 
 /*