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, 2 insertions, 4 deletions

diff --git a/sys/arm/annapurna/alpine/alpine_machdep_mp.c b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
index a4c45b8..4420025 100644
--- a/sys/arm/annapurna/alpine/alpine_machdep_mp.c
+++ b/sys/arm/annapurna/alpine/alpine_machdep_mp.c
@@ -128,16 +128,14 @@ platform_mp_init_secondary(void)
 void
 platform_mp_setmaxid(void)
 {
-	int core_cnt;
 
-	core_cnt = platform_mp_get_core_cnt();
-	mp_maxid = core_cnt - 1;
+	mp_ncpus = platform_mp_get_core_cnt();
+	mp_maxid = mp_ncpus - 1;
 }
 
 int
 platform_mp_probe(void)
 {
-	mp_ncpus = platform_mp_get_core_cnt();
 	return (1);
 }