From owner-svn-src-user@FreeBSD.ORG  Mon Apr 26 01:12:14 2010
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 333201065673;
	Mon, 26 Apr 2010 01:12:14 +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 23B448FC19;
	Mon, 26 Apr 2010 01:12:14 +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 o3Q1CERZ025678;
	Mon, 26 Apr 2010 01:12:14 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3Q1CE6o025676;
	Mon, 26 Apr 2010 01:12:14 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004260112.o3Q1CE6o025676@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 26 Apr 2010 01:12:14 +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: r207214 - user/kmacy/head_page_lock_2/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	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: Mon, 26 Apr 2010 01:12:14 -0000

Author: kmacy
Date: Mon Apr 26 01:12:13 2010
New Revision: 207214
URL: http://svn.freebsd.org/changeset/base/207214

Log:
  My understanding (alc correct me if I'm wrong) is that we don't need protect wire_count if the page is unmanaged
  and the wire count is 1

Modified:
  user/kmacy/head_page_lock_2/sys/vm/vm_page.c

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_page.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_page.c	Sun Apr 25 23:51:05 2010	(r207213)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_page.c	Mon Apr 26 01:12:13 2010	(r207214)
@@ -1595,10 +1595,13 @@ void
 vm_page_unwire(vm_page_t m, int activate)
 {
 
-	vm_page_lock_assert(m, MA_OWNED);
 	if (m->flags & PG_FICTITIOUS)
 		return;
 	if (m->wire_count > 0) {
+#ifdef INVARIANTS
+		if ((m->wire_count > 1) || !(m->flags & PG_UNMANAGED))
+			vm_page_lock_assert(m, MA_OWNED);
+#endif		
 		m->wire_count--;
 		if (m->wire_count == 0) {
 			atomic_subtract_int(&cnt.v_wire_count, 1);