From owner-svn-src-user@FreeBSD.ORG Sat Jun 27 22:23:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 02FC11065672;
Sat, 27 Jun 2009 22:23:07 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id E56258FC0C;
Sat, 27 Jun 2009 22:23:06 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5RMN6Iq090187;
Sat, 27 Jun 2009 22:23:06 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5RMN6PI090184;
Sat, 27 Jun 2009 22:23:06 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906272223.n5RMN6PI090184@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 27 Jun 2009 22:23:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r195126 - in user/kmacy/releng_7_2_fcs/sys: kern vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Jun 2009 22:23:07 -0000
Author: kmacy
Date: Sat Jun 27 22:23:06 2009
New Revision: 195126
URL: http://svn.freebsd.org/changeset/base/195126
Log:
object lock needs to held prior to page lock
Modified:
user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c
user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c
Modified: user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c Sat Jun 27 21:59:47 2009 (r195125)
+++ user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c Sat Jun 27 22:23:06 2009 (r195126)
@@ -607,9 +607,9 @@ static struct witness_order_list_entry o
* VM
*
*/
+ { "vm object", &lock_class_mtx_sleep },
{ "page lock", &lock_class_mtx_sleep },
{ "vm page queue mutex", &lock_class_mtx_sleep },
- { "vm object", &lock_class_mtx_sleep },
{ "pmap", &lock_class_mtx_sleep },
{ NULL, NULL },
/*
Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 21:59:47 2009 (r195125)
+++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 22:23:06 2009 (r195126)
@@ -255,8 +255,8 @@ vm_pageout_fallback_object_lock(vm_page_
m, &marker, pageq);
vm_page_unlock_queues();
vm_page_unlock(m);
- vm_page_lock(m);
VM_OBJECT_LOCK(object);
+ vm_page_lock(m);
vm_page_lock_queues();
/* Page queue might have changed. */