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

[Andrew Turner]

Author: andrew
Date: Thu Jun 11 13:54:18 2015
New Revision: 284264
URL: https://svnweb.freebsd.org/changeset/base/284264

Log:
  Fix the spelling of __ARM_ARCH >= 6 in sys/arm/arm.

Modified:
  head/sys/arm/arm/bcopyinout.S
  head/sys/arm/arm/bcopyinout_xscale.S
  head/sys/arm/arm/copystr.S
  head/sys/arm/arm/locore-v4.S
  head/sys/arm/arm/machdep.c
  head/sys/arm/arm/trap.c

Modified: head/sys/arm/arm/bcopyinout.S
==============================================================================
--- head/sys/arm/arm/bcopyinout.S	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/bcopyinout.S	Thu Jun 11 13:54:18 2015	(r284264)
@@ -38,6 +38,7 @@
 
 #include "assym.s"
 
+#include <machine/acle-compat.h>
 #include <machine/asm.h>
 #include <sys/errno.h>
 
@@ -54,7 +55,7 @@ __FBSDID("$FreeBSD$");
 	.text
 	.align	2
 
-#ifdef _ARM_ARCH_6
+#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
 	mrc p15, 0, tmp, c13, c0, 4; \
 	add	tmp, tmp, #(TD_PCB)

Modified: head/sys/arm/arm/bcopyinout_xscale.S
==============================================================================
--- head/sys/arm/arm/bcopyinout_xscale.S	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/bcopyinout_xscale.S	Thu Jun 11 13:54:18 2015	(r284264)
@@ -38,11 +38,13 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+#include <machine/acle-compat.h>
+
 	.syntax	unified
 	.text
 	.align	2
 
-#ifdef _ARM_ARCH_6
+#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
 	mrc p15, 0, tmp, c13, c0, 4; \
 	add	tmp, tmp, #(TD_PCB)

Modified: head/sys/arm/arm/copystr.S
==============================================================================
--- head/sys/arm/arm/copystr.S	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/copystr.S	Thu Jun 11 13:54:18 2015	(r284264)
@@ -39,6 +39,7 @@
  */
 
 #include "assym.s"
+#include <machine/acle-compat.h>
 #include <machine/asm.h>
 #include <machine/armreg.h>
 __FBSDID("$FreeBSD$");
@@ -48,7 +49,7 @@ __FBSDID("$FreeBSD$");
 	.text
 	.align	2
 
-#ifdef _ARM_ARCH_6
+#if __ARM_ARCH >= 6
 #define GET_PCB(tmp) \
 	mrc p15, 0, tmp, c13, c0, 4; \
 	add	tmp, tmp, #(TD_PCB)

Modified: head/sys/arm/arm/locore-v4.S
==============================================================================
--- head/sys/arm/arm/locore-v4.S	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/locore-v4.S	Thu Jun 11 13:54:18 2015	(r284264)
@@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$");
  *
  * TODO: Fix the ARMv4/v5 case.
  */
-#if (defined(FLASHADDR) || defined(LOADERRAMADDR) || !defined(_ARM_ARCH_6)) && \
-    !defined(PHYSADDR)
+#ifndef PHYSADDR
 #error PHYSADDR must be defined for this configuration
 #endif
 

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/machdep.c	Thu Jun 11 13:54:18 2015	(r284264)
@@ -911,7 +911,7 @@ fake_preload_metadata(struct arm_boot_pa
 void
 pcpu0_init(void)
 {
-#if ARM_ARCH_6 || ARM_ARCH_7A || defined(CPU_MV_PJ4B)
+#if __ARM_ARCH >= 6
 	set_curthread(&thread0);
 #endif
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));

Modified: head/sys/arm/arm/trap.c
==============================================================================
--- head/sys/arm/arm/trap.c	Thu Jun 11 13:53:15 2015	(r284263)
+++ head/sys/arm/arm/trap.c	Thu Jun 11 13:54:18 2015	(r284264)
@@ -98,6 +98,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
+#include <machine/acle-compat.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/machdep.h>
@@ -325,7 +326,7 @@ abort_handler(struct trapframe *tf, int 
 	 * location, so we can deal with those quickly.  Otherwise we need to
 	 * disassemble the faulting instruction to determine if it was a write.
 	 */
-#if ARM_ARCH_6 || ARM_ARCH_7A
+#if __ARM_ARCH >= 6
 	ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
 #else
 	if (IS_PERMISSION_FAULT(fsr))