svn commit: r282762 - head/sys/arm/arm

[Andrew Turner]

Author: andrew
Date: Mon May 11 08:51:24 2015
New Revision: 282762
URL: https://svnweb.freebsd.org/changeset/base/282762

Log:
  Use the ACLE spelling of _ARM_ARCH_6: "__ARM_ARCH >= 6"

Modified:
  head/sys/arm/arm/swtch.S

Modified: head/sys/arm/arm/swtch.S
==============================================================================
--- head/sys/arm/arm/swtch.S	Mon May 11 08:46:23 2015	(r282761)
+++ head/sys/arm/arm/swtch.S	Mon May 11 08:51:24 2015	(r282762)
@@ -81,6 +81,7 @@
 #include "assym.s"
 #include "opt_sched.h"
 
+#include <machine/acle-compat.h>
 #include <machine/asm.h>
 #include <machine/asmacros.h>
 #include <machine/armreg.h>
@@ -88,7 +89,7 @@
 
 __FBSDID("$FreeBSD$");
 
-#if defined(_ARM_ARCH_6) && defined(SMP)
+#if __ARM_ARCH >= 6 && defined(SMP)
 #define GET_PCPU(tmp, tmp2) \
 	mrc 	p15, 0, tmp, c0, c0, 5;	\
 	and	tmp, tmp, #0xf;		\