From owner-svn-src-user@FreeBSD.ORG  Tue Apr 20 03:20:20 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 DBC861065672;
	Tue, 20 Apr 2010 03:20:20 +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 CC1EF8FC2A;
	Tue, 20 Apr 2010 03:20:20 +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 o3K3KKxe098992;
	Tue, 20 Apr 2010 03:20:20 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3K3KKKx098990;
	Tue, 20 Apr 2010 03:20:20 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004200320.o3K3KKKx098990@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 20 Apr 2010 03:20:20 +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: r206884 - user/kmacy/head_page_lock_2/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: Tue, 20 Apr 2010 03:20:20 -0000

Author: kmacy
Date: Tue Apr 20 03:20:20 2010
New Revision: 206884
URL: http://svn.freebsd.org/changeset/base/206884

Log:
  in pmap_protect only call tryrelock if the page is managed and either the accessed or modified bit is set

Modified:
  user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c

Modified: user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Tue Apr 20 03:02:54 2010	(r206883)
+++ user/kmacy/head_page_lock_2/sys/amd64/amd64/pmap.c	Tue Apr 20 03:20:20 2010	(r206884)
@@ -3317,21 +3317,18 @@ retry:
 			obits = pbits = *pte;
 			if ((pbits & PG_V) == 0)
 				continue;
-			if (pbits & PG_MANAGED) {
-				m = NULL;
+			if ((pbits & PG_MANAGED) &&
+			    (pbits & (PG_M | PG_A))) {
 				if (pa_tryrelock(pmap, pbits & PG_FRAME, &pa))
 					goto restart;
+
+				m = PHYS_TO_VM_PAGE(pbits & PG_FRAME);
 				if (pbits & PG_A) {
-					m = PHYS_TO_VM_PAGE(pbits & PG_FRAME);
 					vm_page_flag_set(m, PG_REFERENCED);
 					pbits &= ~PG_A;
 				}
-				if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
-					if (m == NULL)
-						m = PHYS_TO_VM_PAGE(pbits &
-						    PG_FRAME);
+				if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW))
 					vm_page_dirty(m);
-				}
 			}
 
 			if ((prot & VM_PROT_WRITE) == 0)