aboutsummaryrefslogtreecommitdiff
path: root/sys/arm/annapurna
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2015-11-08 14:26:50 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2015-11-08 14:26:50 +0000
commit27f38a8d699b6ffe5135ebae4641e679621a184e (patch)
treed99bd7707b05f7869f04d5798da496d2d1e398bd /sys/arm/annapurna
parent91e93daf9c35eded8dd5e222a031aee4fbef8005 (diff)
downloadsrc-27f38a8d699b6ffe5135ebae4641e679621a184e.tar.gz
src-27f38a8d699b6ffe5135ebae4641e679621a184e.zip
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)
Notes
Notes: svn path=/head/; revision=290547
Diffstat (limited to 'sys/arm/annapurna')
-rw-r--r--sys/arm/annapurna/alpine/alpine_machdep_mp.c6
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 a4c45b8d07fb..4420025c7d70 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);
}