Index: head/sys/arm/allwinner/std.allwinner
===================================================================
--- head/sys/arm/allwinner/std.allwinner
+++ head/sys/arm/allwinner/std.allwinner
@@ -1,7 +1,7 @@
 # Allwinner common options
 #$FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/allwinner/std.allwinner_up
===================================================================
--- head/sys/arm/allwinner/std.allwinner_up
+++ head/sys/arm/allwinner/std.allwinner_up
@@ -1,7 +1,7 @@
 # Allwinner Uniprocessor common options
 #$FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA8
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/altera/socfpga/std.socfpga
===================================================================
--- head/sys/arm/altera/socfpga/std.socfpga
+++ head/sys/arm/altera/socfpga/std.socfpga
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/amlogic/aml8726/std.aml8726
===================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726
+++ head/sys/arm/amlogic/aml8726/std.aml8726
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/annapurna/alpine/std.alpine
===================================================================
--- head/sys/arm/annapurna/alpine/std.alpine
+++ head/sys/arm/annapurna/alpine/std.alpine
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
Index: head/sys/arm/arm/cpufunc.c
===================================================================
--- head/sys/arm/arm/cpufunc.c
+++ head/sys/arm/arm/cpufunc.c
@@ -438,7 +438,7 @@
 };
 #endif /*CPU_ARM1176 */
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 struct cpu_functions cortexa_cpufuncs = {
 	/* MMU functions */
 	.cf_control = cpufunc_control,
@@ -463,7 +463,7 @@
 	/* Soft functions */
 	.cf_setup = cortexa_setup
 };
-#endif /* CPU_CORTEXA */
+#endif /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
 
 /*
  * Global constants also used by locore.s
@@ -481,7 +481,7 @@
   defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) ||		\
   defined(CPU_FA526) || defined(CPU_MV_PJ4B) ||			\
   defined(CPU_XSCALE_81342) || \
-  defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+  defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 
 /* Global cache line sizes, use 32 as default */
 int	arm_dcache_min_line_size = 32;
@@ -672,7 +672,7 @@
 		goto out;
 	}
 #endif /* CPU_ARM1176 */
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 	switch(cputype & CPU_ID_SCHEME_MASK) {
 	case CPU_ID_CORTEXA5:
 	case CPU_ID_CORTEXA7:
@@ -690,7 +690,7 @@
 	default:
 		break;
 	}
-#endif /* CPU_CORTEXA */
+#endif /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
 
 #if defined(CPU_MV_PJ4B)
 	if (cputype == CPU_ID_MV88SV581X_V7 ||
@@ -843,7 +843,7 @@
 
 #if defined(CPU_ARM1176) \
  || defined(CPU_MV_PJ4B) \
- || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+ || defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 static __inline void
 cpu_scc_setup_ccnt(void)
 {
@@ -913,7 +913,7 @@
 }
 #endif /* CPU_MV_PJ4B */
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 
 void
 cortexa_setup(void)
@@ -921,7 +921,7 @@
 
 	cpu_scc_setup_ccnt();
 }
-#endif  /* CPU_CORTEXA */
+#endif  /* CPU_CORTEXA8 || CPU_CORTEXA_MP || CPU_KRAIT */
 
 #if defined(CPU_FA526)
 void
Index: head/sys/arm/arm/elf_trampoline.c
===================================================================
--- head/sys/arm/arm/elf_trampoline.c
+++ head/sys/arm/arm/elf_trampoline.c
@@ -88,7 +88,7 @@
 #elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
 #define cpu_l2cache_wbinv_all	sheeva_l2cache_wbinv_all
 extern void sheeva_l2cache_wbinv_all(void);
-#elif defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#elif defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
 #define cpu_idcache_wbinv_all	armv7_idcache_wbinv_all
 #define cpu_l2cache_wbinv_all()
 #else
Index: head/sys/arm/broadcom/bcm2835/std.bcm2836
===================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2836
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 machine 	arm armv6
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 makeoptions	CONF_CFLAGS="-march=armv7a"
 options 	SOC_BCM2836
 
Index: head/sys/arm/conf/GENERIC
===================================================================
--- head/sys/arm/conf/GENERIC
+++ head/sys/arm/conf/GENERIC
@@ -20,7 +20,7 @@
 
 ident		GENERIC
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/freescale/imx/std.imx51
===================================================================
--- head/sys/arm/freescale/imx/std.imx51
+++ head/sys/arm/freescale/imx/std.imx51
@@ -1,6 +1,6 @@
 # $FreeBSD$
 machine		arm	armv6
-cpu 		CPU_CORTEXA
+cpu 		CPU_CORTEXA8
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 options		KERNVIRTADDR=0xc0100000
Index: head/sys/arm/freescale/imx/std.imx53
===================================================================
--- head/sys/arm/freescale/imx/std.imx53
+++ head/sys/arm/freescale/imx/std.imx53
@@ -1,6 +1,6 @@
 # $FreeBSD$
 machine		arm	armv6
-cpu 		CPU_CORTEXA
+cpu 		CPU_CORTEXA8
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 options		KERNVIRTADDR=0xc0100000
Index: head/sys/arm/freescale/imx/std.imx6
===================================================================
--- head/sys/arm/freescale/imx/std.imx6
+++ head/sys/arm/freescale/imx/std.imx6
@@ -1,6 +1,6 @@
 # $FreeBSD$
 machine		arm	armv6
-cpu 		CPU_CORTEXA
+cpu 		CPU_CORTEXA_MP
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 options		KERNVIRTADDR		= 0xc2000000
Index: head/sys/arm/freescale/vybrid/std.vybrid
===================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid
+++ head/sys/arm/freescale/vybrid/std.vybrid
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/include/cpuconf.h
===================================================================
--- head/sys/arm/include/cpuconf.h
+++ head/sys/arm/include/cpuconf.h
@@ -56,7 +56,8 @@
 			 defined(CPU_XSCALE_PXA2X0) +			\
 			 defined(CPU_FA526) +				\
 			 defined(CPU_XSCALE_IXP425)) +			\
-			 defined(CPU_CORTEXA) +				\
+			 defined(CPU_CORTEXA8) +			\
+			 defined(CPU_CORTEXA_MP) +			\
 			 defined(CPU_KRAIT) +				\
 			 defined(CPU_MV_PJ4B)
 
@@ -85,7 +86,8 @@
 #endif
 #endif
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+    defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
 #define ARM_ARCH_7A	1
 #else
 #define ARM_ARCH_7A	0
@@ -155,7 +157,8 @@
 #define ARM_MMU_V6		0
 #endif
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+    defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
 #define ARM_MMU_V7		1
 #else
 #define ARM_MMU_V7		0
Index: head/sys/arm/include/cpufunc.h
===================================================================
--- head/sys/arm/include/cpufunc.h
+++ head/sys/arm/include/cpufunc.h
@@ -278,7 +278,8 @@
 #if defined(CPU_MV_PJ4B)
 void	armv6_idcache_wbinv_all		(void);
 #endif
-#if defined(CPU_MV_PJ4B) || defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \
+    defined(CPU_MV_PJ4B) || defined(CPU_KRAIT)
 void	armv7_setttb			(u_int);
 void	armv7_idcache_wbinv_all		(void);
 void	armv7_cpu_sleep			(int);
Index: head/sys/arm/include/intr.h
===================================================================
--- head/sys/arm/include/intr.h
+++ head/sys/arm/include/intr.h
@@ -76,7 +76,7 @@
 #elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) || \
     defined(CPU_XSCALE_IXP435)
 #define NIRQ		64
-#elif defined(CPU_CORTEXA)
+#elif defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP)
 #define NIRQ		1020
 #elif defined(CPU_KRAIT)
 #define NIRQ		288
Index: head/sys/arm/mv/armada38x/std.armada38x
===================================================================
--- head/sys/arm/mv/armada38x/std.armada38x
+++ head/sys/arm/mv/armada38x/std.armada38x
@@ -1,7 +1,7 @@
 # $FreeBSD$
 files		"../mv/armada38x/files.armada38x"
 files		"../mv/files.mv"
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm	armv6
 
 makeoptions	CONF_CFLAGS="-march=armv7a"
Index: head/sys/arm/nvidia/tegra124/std.tegra124
===================================================================
--- head/sys/arm/nvidia/tegra124/std.tegra124
+++ head/sys/arm/nvidia/tegra124/std.tegra124
@@ -1,5 +1,5 @@
 # $FreeBSD$
-cpu 		CPU_CORTEXA
+cpu 		CPU_CORTEXA_MP
 machine		arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/qemu/std.virt
===================================================================
--- head/sys/arm/qemu/std.virt
+++ head/sys/arm/qemu/std.virt
@@ -1,6 +1,6 @@
 # $FreeBSD$
 machine		arm	armv6
-cpu 		CPU_CORTEXA
+cpu 		CPU_CORTEXA_MP
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
 options 	KERNVIRTADDR		= 0xc1000000
Index: head/sys/arm/rockchip/std.rk30xx
===================================================================
--- head/sys/arm/rockchip/std.rk30xx
+++ head/sys/arm/rockchip/std.rk30xx
@@ -1,7 +1,7 @@
 # Rockchip rk30xx common options
 #$FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/samsung/exynos/std.exynos5250
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250
+++ head/sys/arm/samsung/exynos/std.exynos5250
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/samsung/exynos/std.exynos5420
===================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420
+++ head/sys/arm/samsung/exynos/std.exynos5420
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/ti/am335x/std.am335x
===================================================================
--- head/sys/arm/ti/am335x/std.am335x
+++ head/sys/arm/ti/am335x/std.am335x
@@ -3,6 +3,8 @@
 files		"../ti/am335x/files.am335x"
 include		"../ti/std.ti"
 
+cpu 		CPU_CORTEXA8
+
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
Index: head/sys/arm/ti/omap4/std.omap4
===================================================================
--- head/sys/arm/ti/omap4/std.omap4
+++ head/sys/arm/ti/omap4/std.omap4
@@ -3,6 +3,8 @@
 files		"../ti/omap4/files.omap4"
 include		"../ti/std.ti"
 
+cpu 		CPU_CORTEXA_MP
+
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 
Index: head/sys/arm/ti/std.ti
===================================================================
--- head/sys/arm/ti/std.ti
+++ head/sys/arm/ti/std.ti
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-cpu 		CPU_CORTEXA
 machine 	arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/arm/xilinx/std.zynq7
===================================================================
--- head/sys/arm/xilinx/std.zynq7
+++ head/sys/arm/xilinx/std.zynq7
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 
-cpu		CPU_CORTEXA
+cpu		CPU_CORTEXA_MP
 machine		arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
Index: head/sys/conf/files.arm
===================================================================
--- head/sys/conf/files.arm
+++ head/sys/conf/files.arm
@@ -32,7 +32,7 @@
 arm/arm/cpufunc_asm_armv4.S 	optional	cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_81342
 arm/arm/cpufunc_asm_armv5_ec.S 	optional	cpu_arm9e
 arm/arm/cpufunc_asm_armv6.S 	optional	cpu_arm1176
-arm/arm/cpufunc_asm_armv7.S	optional	cpu_cortexa | cpu_krait | cpu_mv_pj4b
+arm/arm/cpufunc_asm_armv7.S	optional	cpu_cortexa8 | cpu_cortexa_mp | cpu_krait | cpu_mv_pj4b
 arm/arm/cpufunc_asm_fa526.S	optional	cpu_fa526
 arm/arm/cpufunc_asm_pj4b.S	optional	cpu_mv_pj4b
 arm/arm/cpufunc_asm_sheeva.S 	optional	cpu_arm9e
Index: head/sys/conf/options.arm
===================================================================
--- head/sys/conf/options.arm
+++ head/sys/conf/options.arm
@@ -10,7 +10,8 @@
 CPU_ARM9		opt_global.h
 CPU_ARM9E		opt_global.h
 CPU_ARM1176		opt_global.h
-CPU_CORTEXA		opt_global.h
+CPU_CORTEXA8		opt_global.h # Support the Cortex-A8 (no MP extensions)
+CPU_CORTEXA_MP		opt_global.h # Support Cortex-A CPUs with MP extensions
 CPU_KRAIT		opt_global.h
 CPU_FA526		opt_global.h
 CPU_MV_PJ4B		opt_global.h