From owner-svn-src-all@FreeBSD.ORG  Thu Jan  6 22:52:53 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A388106564A;
	Thu,  6 Jan 2011 22:52:53 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2902B8FC08;
	Thu,  6 Jan 2011 22:52:53 +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 p06MqrYQ031283;
	Thu, 6 Jan 2011 22:52:53 GMT (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06Mqruc031281;
	Thu, 6 Jan 2011 22:52:53 GMT (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201101062252.p06Mqruc031281@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Thu, 6 Jan 2011 22:52:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217080 - releng/8.2/sys/i386/xen
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 22:52:53 -0000

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);
 	}
 }