From owner-svn-src-all@FreeBSD.ORG  Sat Nov 28 00:50:09 2009
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 B92F3106566B;
	Sat, 28 Nov 2009 00:50:09 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A8C568FC1C;
	Sat, 28 Nov 2009 00:50:09 +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 nAS0o9lS034132;
	Sat, 28 Nov 2009 00:50:09 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAS0o90U034131;
	Sat, 28 Nov 2009 00:50:09 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200911280050.nAS0o90U034131@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 28 Nov 2009 00:50:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199870 - head/sys/vm
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: Sat, 28 Nov 2009 00:50:09 -0000

Author: alc
Date: Sat Nov 28 00:50:09 2009
New Revision: 199870
URL: http://svn.freebsd.org/changeset/base/199870

Log:
  Properly synchronize the previous change.

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Fri Nov 27 22:08:29 2009	(r199869)
+++ head/sys/vm/vm_fault.c	Sat Nov 28 00:50:09 2009	(r199870)
@@ -761,8 +761,10 @@ vnode_locked:
 				fs.first_m->valid = VM_PAGE_BITS_ALL;
 				if (wired && (fault_flags &
 				    VM_FAULT_CHANGE_WIRING) == 0) {
+					vm_page_lock_queues();
 					vm_page_wire(fs.first_m);
 					vm_page_unwire(fs.m, FALSE);
+					vm_page_unlock_queues();
 				}
 				/*
 				 * We no longer need the old page or object.