aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arm/arm/copystr.S1
-rw-r--r--sys/arm/arm/fusu.S1
-rw-r--r--sys/arm/arm/support.S1
-rw-r--r--sys/arm/include/sysarch.h2
4 files changed, 1 insertions, 4 deletions
diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S
index 7cd35713f6ed..0b95686e3964 100644
--- a/sys/arm/arm/copystr.S
+++ b/sys/arm/arm/copystr.S
@@ -42,7 +42,6 @@
#include "assym.s"
#include <machine/asm.h>
#include <machine/armreg.h>
-#include <machine/asmacros.h>
__FBSDID("$FreeBSD$");
#include <sys/errno.h>
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 85612958e225..137bdf60994a 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -34,7 +34,6 @@
*/
#include <machine/asm.h>
-#include <machine/asmacros.h>
#include <machine/armreg.h>
#include "assym.s"
__FBSDID("$FreeBSD$");
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index b6d2dbb84cba..9019e3301eb4 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -87,7 +87,6 @@
*/
#include <machine/asm.h>
-#include <machine/asmacros.h>
__FBSDID("$FreeBSD$");
#include "assym.s"
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index 95d02111f010..71023e89d972 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -45,7 +45,7 @@
* The cpu_switch() code assumes ARM_RAS_START is ARM_TP_ADDRESS + 4, and
* ARM_RAS_END is ARM_TP_ADDRESS + 8, so if that ever changes, be sure to
* update the cpu_switch() (and cpu_throw()) code as well.
- * In addition, code in arm/include/atomic.h and arm/include/asmacros.h
+ * In addition, code in arm/include/atomic.h and arm/arm/exception.S
* assumes that ARM_RAS_END is at ARM_RAS_START+4, so be sure to update those
* if ARM_RAS_END moves in relation to ARM_RAS_START (look for occurrences
* of ldr/str rm,[rn, #4]).