From owner-svn-src-all@FreeBSD.ORG  Sat Jun  1 20:32:35 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 08F71CE3;
 Sat,  1 Jun 2013 20:32:35 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F01B4E32;
 Sat,  1 Jun 2013 20:32:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r51KWY8q000709;
 Sat, 1 Jun 2013 20:32:34 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r51KWYY9000708;
 Sat, 1 Jun 2013 20:32:34 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201306012032.r51KWYY9000708@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 1 Jun 2013 20:32:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251229 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 01 Jun 2013 20:32:35 -0000

Author: alc
Date: Sat Jun  1 20:32:34 2013
New Revision: 251229
URL: http://svnweb.freebsd.org/changeset/base/251229

Log:
  Now that access to the page's "act_count" field is synchronized by the page
  lock instead of the object lock, there is no reason for vm_page_activate()
  to assert that the object is locked for either read or write access.
  (The "VPO_UNMANAGED" flag never changes after page allocation.)
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sat Jun  1 19:07:03 2013	(r251228)
+++ head/sys/vm/vm_page.c	Sat Jun  1 20:32:34 2013	(r251229)
@@ -1837,7 +1837,6 @@ vm_page_activate(vm_page_t m)
 	int queue;
 
 	vm_page_lock_assert(m, MA_OWNED);
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
 	if ((queue = m->queue) != PQ_ACTIVE) {
 		if (m->wire_count == 0 && (m->oflags & VPO_UNMANAGED) == 0) {
 			if (m->act_count < ACT_INIT)