29c29
< __FBSDID("$FreeBSD: head/sys/dev/cpuctl/cpuctl.c 301962 2016-06-16 12:07:40Z kib $");
---
> __FBSDID("$FreeBSD: head/sys/dev/cpuctl/cpuctl.c 302372 2016-07-06 14:09:49Z nwhitehorn $");
123c123
< KASSERT(cpu >= 0 && cpu < mp_ncpus && cpu_enabled(cpu),
---
> KASSERT(cpu >= 0 && cpu <= mp_maxid && cpu_enabled(cpu),
136c136
< KASSERT(oldcpu >= 0 && oldcpu < mp_ncpus && cpu_enabled(oldcpu),
---
> KASSERT(oldcpu >= 0 && oldcpu <= mp_maxid && cpu_enabled(oldcpu),
153c153
< if (cpu >= mp_ncpus || !cpu_enabled(cpu)) {
---
> if (cpu > mp_maxid || !cpu_enabled(cpu)) {
204c204
< KASSERT(cpu >= 0 && cpu < mp_ncpus,
---
> KASSERT(cpu >= 0 && cpu <= mp_maxid,
248c248
< KASSERT(cpu >= 0 && cpu < mp_ncpus,
---
> KASSERT(cpu >= 0 && cpu <= mp_maxid,
299c299
< KASSERT(cpu >= 0 && cpu < mp_ncpus,
---
> KASSERT(cpu >= 0 && cpu <= mp_maxid,
515c515
< if (cpu >= mp_ncpus || !cpu_enabled(cpu)) {
---
> if (cpu > mp_maxid || !cpu_enabled(cpu)) {
534c534
< cpuctl_devs = malloc(sizeof(*cpuctl_devs) * mp_ncpus, M_CPUCTL,
---
> cpuctl_devs = malloc(sizeof(*cpuctl_devs) * (mp_maxid + 1), M_CPUCTL,
536c536
< for (cpu = 0; cpu < mp_ncpus; cpu++)
---
> CPU_FOREACH(cpu)
542c542
< for (cpu = 0; cpu < mp_ncpus; cpu++) {
---
> CPU_FOREACH(cpu) {