From owner-svn-src-user@FreeBSD.ORG  Fri Feb 20 15:26:35 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 50292106567F;
	Fri, 20 Feb 2009 15:26:35 +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 3CCC98FC0A;
	Fri, 20 Feb 2009 15:26:35 +0000 (UTC) (envelope-from alc@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 n1KFQZX3032568;
	Fri, 20 Feb 2009 15:26:35 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KFQZhT032567;
	Fri, 20 Feb 2009 15:26:35 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902201526.n1KFQZhT032567@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 20 Feb 2009 15:26:35 +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: r188856 - user/alc/pagelock/sys/amd64/amd64
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: Fri, 20 Feb 2009 15:26:37 -0000

Author: alc
Date: Fri Feb 20 15:26:34 2009
New Revision: 188856
URL: http://svn.freebsd.org/changeset/base/188856

Log:
  Optimize the object locking in pmap_remove_pages().

Modified:
  user/alc/pagelock/sys/amd64/amd64/pmap.c

Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/alc/pagelock/sys/amd64/amd64/pmap.c	Fri Feb 20 15:19:07 2009	(r188855)
+++ user/alc/pagelock/sys/amd64/amd64/pmap.c	Fri Feb 20 15:26:34 2009	(r188856)
@@ -3936,10 +3936,6 @@ restart:
 				}
 			}
 		}
-		if (locked_object != NULL) {
-			VM_OBJECT_UNLOCK(locked_object);
-			locked_object = NULL;
-		}
 		if (allfree) {
 			PV_STAT(pv_entry_spare -= _NPCPV);
 			PV_STAT(pc_chunk_count--);
@@ -3952,6 +3948,8 @@ restart:
 			vm_page_free(m);
 		}
 	}
+	if (locked_object != NULL)
+		VM_OBJECT_UNLOCK(locked_object);
 	pmap_invalidate_all(pmap);
 	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);