From owner-svn-src-all@FreeBSD.ORG  Mon Mar 19 15:50:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B47E41065670;
	Mon, 19 Mar 2012 15:50:15 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FD098FC12;
	Mon, 19 Mar 2012 15:50:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JFoFgV075229;
	Mon, 19 Mar 2012 15:50:15 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JFoFbU075227;
	Mon, 19 Mar 2012 15:50:15 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201203191550.q2JFoFbU075227@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 19 Mar 2012 15:50:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233185 - head/sys/amd64/amd64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 19 Mar 2012 15:50:15 -0000

Author: kib
Date: Mon Mar 19 15:50:14 2012
New Revision: 233185
URL: http://svn.freebsd.org/changeset/base/233185

Log:
  Re-apply r233122 erronously reverted in r233168.
  
  Submitted by:	 jhb
  Pointy hat to:	 kib
  MFC after: 2 weeks

Modified:
  head/sys/amd64/amd64/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Mon Mar 19 13:54:15 2012	(r233184)
+++ head/sys/amd64/amd64/pmap.c	Mon Mar 19 15:50:14 2012	(r233185)
@@ -2942,8 +2942,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
 	pdp_entry_t *pdpe;
 	pd_entry_t ptpaddr, *pde;
 	pt_entry_t *pte;
-	int anychanged;
-	boolean_t pv_lists_locked;
+	boolean_t anychanged, pv_lists_locked;
 
 	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
@@ -2956,7 +2955,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
 
 	pv_lists_locked = FALSE;
 resume:
-	anychanged = 0;
+	anychanged = FALSE;
 
 	PMAP_LOCK(pmap);
 	for (; sva < eva; sva = va_next) {
@@ -3004,7 +3003,7 @@ resume:
 				 * invalidated by pmap_protect_pde().
 				 */
 				if (pmap_protect_pde(pmap, pde, sva, prot))
-					anychanged = 1;
+					anychanged = TRUE;
 				continue;
 			} else {
 				if (!pv_lists_locked) {
@@ -3058,7 +3057,7 @@ retry:
 				if (obits & PG_G)
 					pmap_invalidate_page(pmap, sva);
 				else
-					anychanged = 1;
+					anychanged = TRUE;
 			}
 		}
 	}