summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2015-06-11 13:58:40 +0000
committerandrew <andrew@FreeBSD.org>2015-06-11 13:58:40 +0000
commitc834aadf0c28dc5e6a679d382de0b425e96c2138 (patch)
tree62b8d1698a52400e3e740a5936bb4e42d91165f2
parent87f930acae88ec889a9426649e2391a465e339da (diff)
downloadFreeBSD-src-c834aadf0c28dc5e6a679d382de0b425e96c2138.zip
FreeBSD-src-c834aadf0c28dc5e6a679d382de0b425e96c2138.tar.gz
Stop using VFP in pcpu.h when we mean ARMv6 and later.
-rw-r--r--sys/arm/include/pcpu.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index 4ce8b3a..73400c5 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -32,6 +32,7 @@
#ifdef _KERNEL
+#include <machine/acle-compat.h>
#include <machine/cpuconf.h>
#define ALT_STACK_SIZE 128
@@ -40,7 +41,7 @@ struct vmspace;
#endif /* _KERNEL */
-#ifdef VFP
+#if __ARM_ARCH >= 6
#define PCPU_MD_FIELDS \
unsigned int pc_vfpsid; \
unsigned int pc_vfpmvfr0; \
@@ -58,9 +59,8 @@ struct pcb;
struct pcpu;
extern struct pcpu *pcpup;
-#if ARM_ARCH_6 || ARM_ARCH_7A
-/* or ARM_TP_ADDRESS mark REMOVE ME NOTE */
+#if __ARM_ARCH >= 6
#define CPU_MASK (0xf)
#ifndef SMP
OpenPOWER on IntegriCloud