From owner-svn-src-all@freebsd.org  Wed Feb  3 12:11:08 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4816A995F4;
 Wed,  3 Feb 2016 12:11:08 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6D985D7A;
 Wed,  3 Feb 2016 12:11:08 +0000 (UTC)
 (envelope-from skra@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u13CB7Kf031484;
 Wed, 3 Feb 2016 12:11:07 GMT (envelope-from skra@FreeBSD.org)
Received: (from skra@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u13CB7gj031482;
 Wed, 3 Feb 2016 12:11:07 GMT (envelope-from skra@FreeBSD.org)
Message-Id: <201602031211.u13CB7gj031482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skra set sender to
 skra@FreeBSD.org using -f
From: Svatopluk Kraus <skra@FreeBSD.org>
Date: Wed, 3 Feb 2016 12:11:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295206 - in head/sys/arm: arm include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Feb 2016 12:11:08 -0000

Author: skra
Date: Wed Feb  3 12:11:07 2016
New Revision: 295206
URL: https://svnweb.freebsd.org/changeset/base/295206

Log:
  Partly revert r295168 and define PTE_DEVICE in pmap-v6.h header again.
  It turned out that devmap.c is not only file in which PTE_DEVICE
  is used and simultaneously, built for both armv4 and armv6 platforms.
  
  When I tried to build all arm kernels before r295168 commit, it was
  hid by some other local changes in my tree. I hope that this is just
  temporary workaround before VM_MEMATTR_DEVICE could be used instead of
  PTE_DEVICE outside of pmap code for __ARM_ARCH < 6.

Modified:
  head/sys/arm/arm/devmap.c
  head/sys/arm/include/pmap-v6.h

Modified: head/sys/arm/arm/devmap.c
==============================================================================
--- head/sys/arm/arm/devmap.c	Wed Feb  3 11:49:51 2016	(r295205)
+++ head/sys/arm/arm/devmap.c	Wed Feb  3 12:11:07 2016	(r295206)
@@ -55,9 +55,6 @@ static boolean_t devmap_bootstrap_done =
 #define	PTE_DEVICE	VM_MEMATTR_DEVICE
 #elif defined(__arm__)
 #define	MAX_VADDR	ARM_VECTORS_HIGH
-#if __ARM_ARCH >= 6
-#define	PTE_DEVICE	VM_MEMATTR_DEVICE
-#endif
 #endif
 
 /*

Modified: head/sys/arm/include/pmap-v6.h
==============================================================================
--- head/sys/arm/include/pmap-v6.h	Wed Feb  3 11:49:51 2016	(r295205)
+++ head/sys/arm/include/pmap-v6.h	Wed Feb  3 12:11:07 2016	(r295206)
@@ -250,6 +250,8 @@ void pmap_preboot_map_attr(vm_paddr_t, v
  */
 void vector_page_setprot(int);
 
+#define PTE_DEVICE	VM_MEMATTR_DEVICE
+
 #endif	/* _KERNEL */
 // -----------------------------------------------------------------------------