svn commit: r217080 - releng/8.2/sys/i386/xen

[Colin Percival]

Author: cperciva
Date: Thu Jan  6 22:52:52 2011
New Revision: 217080
URL: http://svn.freebsd.org/changeset/base/217080

Log:
  MFS r217051: Fix panic when mlock(2) is used on i386/XEN.
  
  PR:		kern/140313
  Approved by:	re (rwatson)

Modified:
  releng/8.2/sys/i386/xen/pmap.c
Directory Properties:
  releng/8.2/sys/   (props changed)
  releng/8.2/sys/amd64/include/xen/   (props changed)
  releng/8.2/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.2/sys/contrib/dev/acpica/   (props changed)
  releng/8.2/sys/contrib/pf/   (props changed)

Modified: releng/8.2/sys/i386/xen/pmap.c
==============================================================================
--- releng/8.2/sys/i386/xen/pmap.c	Thu Jan  6 22:26:00 2011	(r217079)
+++ releng/8.2/sys/i386/xen/pmap.c	Thu Jan  6 22:52:52 2011	(r217080)
@@ -1070,7 +1070,9 @@ pmap_pte_release(pt_entry_t *pte)
 	if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) {
 		CTR1(KTR_PMAP, "pmap_pte_release: pte=0x%jx",
 		    *PMAP2);
+		vm_page_lock_queues();
 		PT_SET_VA(PMAP2, 0, TRUE);
+		vm_page_unlock_queues();
 		mtx_unlock(&PMAP2mutex);
 	}
 }