Index: head/sys/arm/allwinner/a20/a20_mp.c
===================================================================
--- head/sys/arm/allwinner/a20/a20_mp.c
+++ head/sys/arm/allwinner/a20/a20_mp.c
@@ -81,16 +81,6 @@
 	mp_maxid = ncpu - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/altera/socfpga/socfpga_mp.c
===================================================================
--- head/sys/arm/altera/socfpga/socfpga_mp.c
+++ head/sys/arm/altera/socfpga/socfpga_mp.c
@@ -111,16 +111,6 @@
 	mp_maxid = ncpu - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/amlogic/aml8726/aml8726_mp.c
===================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_mp.c
+++ head/sys/arm/amlogic/aml8726/aml8726_mp.c
@@ -433,18 +433,6 @@
 	mp_maxid = ncpu - 1;
 }
 
-
-int
-platform_mp_probe(void)
-{
-
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-
-	return (mp_ncpus > 1);
-}
-
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/annapurna/alpine/alpine_machdep_mp.c
===================================================================
--- head/sys/arm/annapurna/alpine/alpine_machdep_mp.c
+++ head/sys/arm/annapurna/alpine/alpine_machdep_mp.c
@@ -133,12 +133,6 @@
 	mp_maxid = mp_ncpus - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-	return (1);
-}
-
 static int
 alpine_get_cpu_resume_base(u_long *pbase, u_long *psize)
 {
Index: head/sys/arm/arm/mp_machdep.c
===================================================================
--- head/sys/arm/arm/mp_machdep.c
+++ head/sys/arm/arm/mp_machdep.c
@@ -86,9 +86,12 @@
 int
 cpu_mp_probe(void)
 {
+
+	KASSERT(mp_ncpus != 0, ("cpu_mp_probe: mp_ncpus is unset"));
+
 	CPU_SETOF(0, &all_cpus);
 
-	return (platform_mp_probe());
+	return (mp_ncpus > 1);
 }
 
 /* Start Application Processor via platform specific function */
Index: head/sys/arm/broadcom/bcm2835/bcm2836_mp.c
===================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2836_mp.c
+++ head/sys/arm/broadcom/bcm2835/bcm2836_mp.c
@@ -95,17 +95,6 @@
 	DPRINTF("mp_maxid=%d\n", mp_maxid);
 }
 
-int
-platform_mp_probe(void)
-{
-
-	DPRINTF("platform_mp_probe\n");
-	CPU_SETOF(0, &all_cpus);
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/freescale/imx/imx6_mp.c
===================================================================
--- head/sys/arm/freescale/imx/imx6_mp.c
+++ head/sys/arm/freescale/imx/imx6_mp.c
@@ -99,17 +99,6 @@
 	mp_maxid = ncpu - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	/* I think platform_mp_setmaxid must get called first, but be safe. */
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-
-	return (mp_ncpus > 1);
-}
-
 void    
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/include/smp.h
===================================================================
--- head/sys/arm/include/smp.h
+++ head/sys/arm/include/smp.h
@@ -45,7 +45,6 @@
 
 /* Platform interface */
 void	platform_mp_setmaxid(void);
-int	platform_mp_probe(void);
 void	platform_mp_start_ap(void);
 void	platform_mp_init_secondary(void);
 
Index: head/sys/arm/mv/armada38x/armada38x_mp.c
===================================================================
--- head/sys/arm/mv/armada38x/armada38x_mp.c
+++ head/sys/arm/mv/armada38x/armada38x_mp.c
@@ -130,13 +130,6 @@
 	mp_maxid = 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_init_secondary(void)
 {
Index: head/sys/arm/mv/armadaxp/armadaxp_mp.c
===================================================================
--- head/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ head/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -87,13 +87,6 @@
 	mp_maxid = mp_ncpus - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_init_secondary(void)
 {
Index: head/sys/arm/qemu/virt_mp.c
===================================================================
--- head/sys/arm/qemu/virt_mp.c
+++ head/sys/arm/qemu/virt_mp.c
@@ -46,13 +46,6 @@
 
 static int running_cpus;
 
-int
-platform_mp_probe(void)
-{
-
-	return (mp_ncpus > 1);
-}
-
 static boolean_t
 virt_maxid(u_int id, phandle_t node, u_int addr_cells, pcell_t *reg)
 {
Index: head/sys/arm/rockchip/rk30xx_mp.c
===================================================================
--- head/sys/arm/rockchip/rk30xx_mp.c
+++ head/sys/arm/rockchip/rk30xx_mp.c
@@ -107,16 +107,6 @@
 	mp_maxid = ncpu - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	if (mp_ncpus == 0)
-		platform_mp_setmaxid();
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/samsung/exynos/exynos5_mp.c
===================================================================
--- head/sys/arm/samsung/exynos/exynos5_mp.c
+++ head/sys/arm/samsung/exynos/exynos5_mp.c
@@ -89,13 +89,6 @@
 	mp_maxid = mp_ncpus - 1;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	return (mp_ncpus > 1);
-}
-
 void
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/ti/omap4/omap4_mp.c
===================================================================
--- head/sys/arm/ti/omap4/omap4_mp.c
+++ head/sys/arm/ti/omap4/omap4_mp.c
@@ -56,13 +56,6 @@
 	mp_ncpus = 2;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	return (1);
-}
-
 void    
 platform_mp_start_ap(void)
 {
Index: head/sys/arm/xilinx/zy7_mp.c
===================================================================
--- head/sys/arm/xilinx/zy7_mp.c
+++ head/sys/arm/xilinx/zy7_mp.c
@@ -61,13 +61,6 @@
 	mp_ncpus = 2;
 }
 
-int
-platform_mp_probe(void)
-{
-
-	return (1);
-}
-
 void    
 platform_mp_start_ap(void)
 {