summaryrefslogtreecommitdiffstats
path: root/sys/arm/mv/armadaxp
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2015-11-08 14:26:50 +0000
committertijl <tijl@FreeBSD.org>2015-11-08 14:26:50 +0000
commit4e8b6b4a06e9b8bd64928b39a5a6cfe0fabaf9f0 (patch)
treed99bd7707b05f7869f04d5798da496d2d1e398bd /sys/arm/mv/armadaxp
parentd94cce972ea22ac1b6d1ef125b413808e1dadf36 (diff)
downloadFreeBSD-src-4e8b6b4a06e9b8bd64928b39a5a6cfe0fabaf9f0.zip
FreeBSD-src-4e8b6b4a06e9b8bd64928b39a5a6cfe0fabaf9f0.tar.gz
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)
Diffstat (limited to 'sys/arm/mv/armadaxp')
-rw-r--r--sys/arm/mv/armadaxp/armadaxp_mp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c
index 1fa4d53..6685204 100644
--- a/sys/arm/mv/armadaxp/armadaxp_mp.c
+++ b/sys/arm/mv/armadaxp/armadaxp_mp.c
@@ -82,15 +82,14 @@ void
platform_mp_setmaxid(void)
{
- mp_maxid = 3;
+ mp_ncpus = platform_get_ncpus();
+ mp_maxid = mp_ncpus - 1;
}
int
platform_mp_probe(void)
{
- mp_ncpus = platform_get_ncpus();
-
return (mp_ncpus > 1);
}
OpenPOWER on IntegriCloud