Since r289279 bufinit() uses mp_ncpus, but some architectures set this

variable during mp_start() which is too late.  Move this to mp_setmaxid()
where other architectures set it and move x86 assertions to MI code.

Reviewed by:	kib (x86 part)

1 files changed, 5 insertions, 11 deletions

diff --git a/sys/arm/qemu/virt_mp.c b/sys/arm/qemu/virt_mp.c
index 2fe1592af0fd..89a30c631f9d 100644
--- a/sys/arm/qemu/virt_mp.c
+++ b/sys/arm/qemu/virt_mp.c
@@ -49,17 +49,8 @@ static int running_cpus;
 int
 platform_mp_probe(void)
 {
-	int ncpus;
 
-	ncpus = ofw_cpu_early_foreach(NULL, true);
-	if (ncpus <= 1) {
-		mp_ncpus = 1;
-		return (0);
-	}
-
-	mp_ncpus = MIN(ncpus, MAXCPU);
-
-	return (1);
+	return (mp_ncpus > 1);
 }
 
 static boolean_t
@@ -77,7 +68,10 @@ platform_mp_setmaxid(void)
 {
 
 	mp_maxid = PCPU_GET(cpuid);
-	ofw_cpu_early_foreach(virt_maxid, true);
+	mp_ncpus = ofw_cpu_early_foreach(virt_maxid, true);
+	if (mp_ncpus < 1)
+		mp_ncpus = 1;
+	mp_ncpus = MIN(ncpus, MAXCPU);
 }
 
 static boolean_t