Author: andrew
Date: Wed Mar 2 14:33:46 2016
New Revision: 296313
URL: https://svnweb.freebsd.org/changeset/base/296313
Log:
The cpu_reset_needs_v4_MMU_disable variable is only used in locore-v4.S,
only define it when building for ARMv5 or prior.
Sponsored by: ABT Systems Ltd
Modified:
head/sys/arm/arm/cpufunc.c
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Wed Mar 2 13:54:43 2016 (r296312)
+++ head/sys/arm/arm/cpufunc.c Wed Mar 2 14:33:46 2016 (r296313)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <vm/uma.h>
+#include <machine/acle-compat.h>
#include <machine/cpuconf.h>
#include <machine/cpufunc.h>
@@ -559,7 +560,9 @@ struct cpu_functions cortexa_cpufuncs =
struct cpu_functions cpufuncs;
u_int cputype;
-u_int cpu_reset_needs_v4_MMU_disable; /* flag used in locore.s */
+#if __ARM_ARCH <= 5
+u_int cpu_reset_needs_v4_MMU_disable; /* flag used in locore-v4.s */
+#endif
#if defined(CPU_ARM9) || \
defined (CPU_ARM9E) || \
@@ -754,7 +757,6 @@ set_cpufuncs()
#if defined(CPU_ARM1176)
if (cputype == CPU_ID_ARM1176JZS) {
cpufuncs = arm1176_cpufuncs;
- cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
get_cachetype_cp15();
goto out;
}
@@ -777,7 +779,6 @@ set_cpufuncs()
cputype == CPU_ID_KRAIT300R0 ||
cputype == CPU_ID_KRAIT300R1 ) {
cpufuncs = cortexa_cpufuncs;
- cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
get_cachetype_cp15();
goto out;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
