svn commit: r295920 - in head/sys/arm: arm include

[Svatopluk Kraus]

Author: skra
Date: Tue Feb 23 10:12:50 2016
New Revision: 295920
URL: https://svnweb.freebsd.org/changeset/base/295920

Log:
  Remove redundant __ARM_ARCH >= 6 check in armv6 specific files.

Modified:
  head/sys/arm/arm/cpu_asm-v6.S
  head/sys/arm/include/cpu-v6.h

Modified: head/sys/arm/arm/cpu_asm-v6.S
==============================================================================
--- head/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 09:29:45 2016	(r295919)
+++ head/sys/arm/arm/cpu_asm-v6.S	Tue Feb 23 10:12:50 2016	(r295920)
@@ -34,16 +34,9 @@
 #include <machine/armreg.h>
 #include <machine/sysreg.h>
 
-#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
-	mrc CP15_TPIDRPRW(tmp); \
-	add   tmp, tmp, #(TD_PCB)
-#else
-.Lcurpcb:
-	.word _C_LABEL(__pcpu) + PC_CURPCB
-#define GET_PCB(tmp) \
-	ldr   tmp, .Lcurpcb
-#endif
+	mrc	CP15_TPIDRPRW(tmp); \
+	add	tmp, tmp, #(TD_PCB)
 
 /*
  * Define cache functions used by startup code, which counts on the fact that

Modified: head/sys/arm/include/cpu-v6.h
==============================================================================
--- head/sys/arm/include/cpu-v6.h	Tue Feb 23 09:29:45 2016	(r295919)
+++ head/sys/arm/include/cpu-v6.h	Tue Feb 23 10:12:50 2016	(r295920)
@@ -177,15 +177,12 @@ _RF0(cp15_dfar_get, CP15_DFAR(%0))
 _RF0(cp15_ifar_get, CP15_IFAR(%0))
 _RF0(cp15_l2ctlr_get, CP15_L2CTLR(%0))
 #endif
-/* ARMv6+ and XScale */
 _RF0(cp15_actlr_get, CP15_ACTLR(%0))
 _WF1(cp15_actlr_set, CP15_ACTLR(%0))
-#if __ARM_ARCH >= 6
 _WF1(cp15_ats1cpr_set, CP15_ATS1CPR(%0))
 _WF1(cp15_ats1cpw_set, CP15_ATS1CPW(%0))
 _RF0(cp15_par_get, CP15_PAR(%0))
 _RF0(cp15_sctlr_get, CP15_SCTLR(%0))
-#endif
 
 /*CPU id registers */
 _RF0(cp15_midr_get, CP15_MIDR(%0))