From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 31 15:52:17 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72BB9106564A;
	Tue, 31 Jan 2012 15:52:17 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 61F048FC08;
	Tue, 31 Jan 2012 15:52:17 +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 q0VFqHQb043241;
	Tue, 31 Jan 2012 15:52:17 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0VFqHm7043239;
	Tue, 31 Jan 2012 15:52:17 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201311552.q0VFqHm7043239@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Tue, 31 Jan 2012 15:52:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230825 - projects/armv6/sys/arm/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jan 2012 15:52:17 -0000

Author: gber
Date: Tue Jan 31 15:52:17 2012
New Revision: 230825
URL: http://svn.freebsd.org/changeset/base/230825

Log:
  Split pmap settings between arm archs.
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/include/pmap.h

Modified: projects/armv6/sys/arm/include/pmap.h
==============================================================================
--- projects/armv6/sys/arm/include/pmap.h	Tue Jan 31 15:51:34 2012	(r230824)
+++ projects/armv6/sys/arm/include/pmap.h	Tue Jan 31 15:52:17 2012	(r230825)
@@ -55,6 +55,7 @@
 /*
  * Pte related macros
  */
+#if ARM_ARCH_6 || ARM_ARCH_7A
 #ifdef SMP
 #define PTE_NOCACHE	2
 #else
@@ -62,6 +63,11 @@
 #endif
 #define PTE_CACHE	4
 #define PTE_PAGETABLE	4
+#else
+#define PTE_NOCACHE	1
+#define PTE_CACHE	2
+#define PTE_PAGETABLE	3
+#endif
 
 enum mem_type {
 	STRONG_ORD = 0,