28c28
< __FBSDID("$FreeBSD: head/sys/kern/subr_taskqueue.c 301208 2016-06-02 15:52:34Z mjg $");
---
> __FBSDID("$FreeBSD: head/sys/kern/subr_taskqueue.c 302372 2016-07-06 14:09:49Z nwhitehorn $");
834a835
> int i, j;
842c843,851
< qcpu->tgc_cpu = idx * qgroup->tqg_stride;
---
>
> for (i = CPU_FIRST(), j = 0; j < idx * qgroup->tqg_stride;
> j++, i = CPU_NEXT(i)) {
> /*
> * Wait: evaluate the idx * qgroup->tqg_stride'th CPU,
> * potentially wrapping the actual count
> */
> }
> qcpu->tgc_cpu = i;
1020c1029
< int i, old_cnt, qid;
---
> int i, k, old_cnt, qid, cpu;
1025,1026c1034,1036
< printf("taskqgroup_adjust failed cnt: %d stride: %d mp_ncpus: %d smp_started: %d\n",
< cnt, stride, mp_ncpus, smp_started);
---
> printf("taskqgroup_adjust failed cnt: %d stride: %d "
> "mp_ncpus: %d smp_started: %d\n", cnt, stride, mp_ncpus,
> smp_started);
1083a1094
> cpu = CPU_FIRST();
1085c1096,1098
< qgroup->tqg_queue[i].tgc_cpu = i * qgroup->tqg_stride;
---
> qgroup->tqg_queue[i].tgc_cpu = cpu;
> for (k = 0; k < qgroup->tqg_stride; k++)
> cpu = CPU_NEXT(cpu);