svn commit: r202835 - stable/7/sys/amd64/amd64

[John Baldwin]

Author: jhb
Date: Fri Jan 22 20:46:11 2010
New Revision: 202835
URL: http://svn.freebsd.org/changeset/base/202835

Log:
  MFC 189551:
  Change pmap_enter_quick_locked() so that it uses the kernel's direct map
  instead of the pmap's recursive mapping to access the lowest level of the
  page table when it maps a user-space virtual address.

Modified:
  stable/7/sys/amd64/amd64/pmap.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/7/sys/amd64/amd64/pmap.c	Fri Jan 22 20:44:34 2010	(r202834)
+++ stable/7/sys/amd64/amd64/pmap.c	Fri Jan 22 20:46:11 2010	(r202835)
@@ -3265,17 +3265,12 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 					return (mpte);
 			}
 		}
+		pte = (pt_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpte));
+		pte = &pte[pmap_pte_index(va)];
 	} else {
 		mpte = NULL;
+		pte = vtopte(va);
 	}
-
-	/*
-	 * This call to vtopte makes the assumption that we are
-	 * entering the page into the current pmap.  In order to support
-	 * quick entry into any pmap, one would likely use pmap_pte.
-	 * But that isn't as quick as vtopte.
-	 */
-	pte = vtopte(va);
 	if (*pte) {
 		if (mpte != NULL) {
 			mpte->wire_count--;