svn commit: r295206 - in head/sys/arm: arm include

[Svatopluk Kraus]

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 */
 // -----------------------------------------------------------------------------