From owner-svn-src-head@FreeBSD.ORG  Fri Nov 29 15:06:12 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2AE813B2;
 Fri, 29 Nov 2013 15:06:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 179891BC8;
 Fri, 29 Nov 2013 15:06:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATF6Bc2084044;
 Fri, 29 Nov 2013 15:06:11 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATF6Bbw084043;
 Fri, 29 Nov 2013 15:06:11 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201311291506.rATF6Bbw084043@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Fri, 29 Nov 2013 15:06:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258742 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Nov 2013 15:06:12 -0000

Author: ian
Date: Fri Nov 29 15:06:11 2013
New Revision: 258742
URL: http://svnweb.freebsd.org/changeset/base/258742

Log:
  Set the PGA_WRITEABLE flag when the protections indicate write access, not
  just when the current access is a write.
  
  Reviewed by:	zbb@

Modified:
  head/sys/arm/arm/pmap-v6.c

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Fri Nov 29 15:05:49 2013	(r258741)
+++ head/sys/arm/arm/pmap-v6.c	Fri Nov 29 15:06:11 2013	(r258742)
@@ -3092,6 +3092,7 @@ validate:
 
 		if (prot & VM_PROT_WRITE) {
 			if ((m->oflags & VPO_UNMANAGED) == 0) {
+				vm_page_aflag_set(m, PGA_WRITEABLE);
 				/*
 				 * Enable write permission if the access type
 				 * indicates write intention. Emulate modified
@@ -3099,7 +3100,6 @@ validate:
 				 */
 				if ((access & VM_PROT_WRITE) != 0) {
 					npte &= ~(L2_APX);
-					vm_page_aflag_set(m, PGA_WRITEABLE);
 					/*
 					 * The access type and permissions
 					 * indicate that the page will be