svn commit: r206139 - stable/7/sys/i386/i386

[Alan Cox]

Author: alc
Date: Sat Apr  3 15:52:32 2010
New Revision: 206139
URL: http://svn.freebsd.org/changeset/base/206139

Log:
  MFC r205652
    A ptrace(2) by one process may trigger a page size promotion in the
    address space of another process.  Modify pmap_promote_pde() to handle
    this.

Modified:
  stable/7/sys/i386/i386/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/i386/i386/pmap.c
==============================================================================
--- stable/7/sys/i386/i386/pmap.c	Sat Apr  3 15:43:28 2010	(r206138)
+++ stable/7/sys/i386/i386/pmap.c	Sat Apr  3 15:52:32 2010	(r206139)
@@ -2990,7 +2990,7 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t
 	 * either invalid, unused, or does not map the first 4KB physical page
 	 * within a 2- or 4MB page.
 	 */
-	firstpte = vtopte(trunc_4mpage(va));
+	firstpte = pmap_pte_quick(pmap, trunc_4mpage(va));
 setpde:
 	newpde = *firstpte;
 	if ((newpde & ((PG_FRAME & PDRMASK) | PG_A | PG_V)) != (PG_A | PG_V)) {