summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/arm/arm/locore.S5
-rw-r--r--sys/arm/include/cpuconf.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index 54b17ed..c689916 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -37,6 +37,7 @@
#include <sys/syscall.h>
#include <machine/asm.h>
#include <machine/armreg.h>
+#include <machine/cpuconf.h>
#include <machine/pte.h>
__FBSDID("$FreeBSD$");
@@ -365,9 +366,9 @@ ASENTRY_NP(mpentry)
nop
CPWAIT(r0)
-#if defined(ARM_MMU_V6)
+#if ARM_MMU_V6
bl armv6_idcache_inv_all /* Modifies r0 only */
-#elif defined(ARM_MMU_V7)
+#elif ARM_MMU_V7
bl armv7_idcache_inv_all /* Modifies r0-r3, ip */
#endif
diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h
index b7cad0d..1f0edba 100644
--- a/sys/arm/include/cpuconf.h
+++ b/sys/arm/include/cpuconf.h
@@ -135,13 +135,13 @@
#define ARM_MMU_GENERIC 0
#endif
-#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B)
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
#define ARM_MMU_V6 1
#else
#define ARM_MMU_V6 0
#endif
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
#define ARM_MMU_V7 1
#else
#define ARM_MMU_V7 0
OpenPOWER on IntegriCloud