aboutsummaryrefslogtreecommitdiff
path: root/sys/arm/include/pmap.h
diff options
context:
space:
mode:
authorMichal Meloun <mmel@FreeBSD.org>2016-01-29 10:31:54 +0000
committerMichal Meloun <mmel@FreeBSD.org>2016-01-29 10:31:54 +0000
commit41a7c569b090b08b272da86206e820ea86a0cfc4 (patch)
treefea063924632398a9b978c5e11bc4a13f90572b9 /sys/arm/include/pmap.h
parent05ef7ed17bc01122387461672141977e5f5e2461 (diff)
downloadsrc-41a7c569b090b08b272da86206e820ea86a0cfc4.tar.gz
src-41a7c569b090b08b272da86206e820ea86a0cfc4.zip
ARM: remove old pmap-v6 code. The new pmap-v6 is mature enough, and
dual implementation is showstopper for major cleanup. This patch only removes old code from tree. Cleanups will follow asap.
Notes
Notes: svn path=/head/; revision=295036
Diffstat (limited to 'sys/arm/include/pmap.h')
-rw-r--r--sys/arm/include/pmap.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index a0b0d94255b8..dc7fd38a20eb 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -46,9 +46,11 @@
*
* $FreeBSD$
*/
-#ifdef ARM_NEW_PMAP
+ #include <machine/acle-compat.h>
+
+#if __ARM_ARCH >= 6
#include <machine/pmap-v6.h>
-#else /* ARM_NEW_PMAP */
+#else /* __ARM_ARCH >= 6 */
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
@@ -704,4 +706,4 @@ extern vm_paddr_t dump_avail[];
#endif /* !LOCORE */
#endif /* !_MACHINE_PMAP_H_ */
-#endif /* !ARM_NEW_PMAP */
+#endif /* __ARM_ARCH >= 6 */