diff --git a/arch/arm/include/arm/spinlock.h b/arch/arm/include/arm/spinlock.h
index efe292acb7..ee3db052cf 100644
--- a/arch/arm/include/arm/spinlock.h
+++ b/arch/arm/include/arm/spinlock.h
@@ -36,22 +36,4 @@
 #ifndef __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H
 #define __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H
 
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#ifdef CONFIG_SMP
-  /* In SMP configurations, save spinlocks and other inter-CPU communications
-   * data in a non-cached memory region.
-   */
-
-#  define SP_SECTION __attribute__((section(.nocache)))
-#endif
-
 #endif /* __ARCH_ARM_INCLUDE_ARM_SPINLOCK_H */
diff --git a/arch/arm/include/armv7-a/spinlock.h b/arch/arm/include/armv7-a/spinlock.h
index 764a96ecef..5c5d1ae6ac 100644
--- a/arch/arm/include/armv7-a/spinlock.h
+++ b/arch/arm/include/armv7-a/spinlock.h
@@ -36,4 +36,22 @@
 #ifndef __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
 #define __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_SMP
+  /* In SMP configurations, save spinlocks and other inter-CPU communications
+   * data in a non-cached memory region.
+   */
+
+#  define SP_SECTION __attribute__((section(".nocache")))
+#endif
+
 #endif /* __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H */
diff --git a/arch/arm/src/imx6/imx_boot.c b/arch/arm/src/imx6/imx_boot.c
index 7e11fba87b..4455d3394a 100644
--- a/arch/arm/src/imx6/imx_boot.c
+++ b/arch/arm/src/imx6/imx_boot.c
@@ -240,6 +240,8 @@ static void imx_intercpu_mapping(void)
   uint32_t intercpu_vaddr = INTERCPU_VADDR & PTE_SMALL_PADDR_MASK;
   uint32_t end_paddr      = INTERCPU_PADDR + INTERCPU_SIZE;
 
+  DEBUGASSERT(intercpu_vaddr == (uint32_t)&_snocache);
+
   /* We want to keep the inter-cpu region in on-chip RAM (OCRAM).  The 
    * i.MX6 has 256Kb of OCRAM positioned at physical address 0x0090:0000.
    */