From owner-svn-src-all@FreeBSD.ORG  Tue Jun 15 22:16:02 2010
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 CEA1A1065679;
	Tue, 15 Jun 2010 22:16:02 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE2AA8FC15;
	Tue, 15 Jun 2010 22:16:02 +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 o5FMG2GG009324;
	Tue, 15 Jun 2010 22:16:02 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5FMG20A009322;
	Tue, 15 Jun 2010 22:16:02 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201006152216.o5FMG20A009322@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Tue, 15 Jun 2010 22:16:02 +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: r209223 - head/sys/arm/arm
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: Tue, 15 Jun 2010 22:16:02 -0000

Author: cognet
Date: Tue Jun 15 22:16:02 2010
New Revision: 209223
URL: http://svn.freebsd.org/changeset/base/209223

Log:
  Turn off cache if there's more than one kernel mapping, and one is writable.
  
  Submitted by:   Mark Tinguely

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

Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c	Tue Jun 15 22:01:38 2010	(r209222)
+++ head/sys/arm/arm/pmap.c	Tue Jun 15 22:16:02 2010	(r209223)
@@ -1368,7 +1368,7 @@ pmap_fix_cache(struct vm_page *pg, pmap_
 		 * check for kernel uncachable conditions
 		 * kernel writable or kernel readable with writable user entry
 		 */
-		if ((kwritable && entries) ||
+		if ((kwritable && (entries || kentries > 1)) ||
 		    (kwritable > 1) ||
 		    ((kwritable != writable) && kentries &&
 		     (pv->pv_pmap == pmap_kernel() ||