qgroup_softirq used, but never defined

[lattera]

In drm-next-4.7, a recursive grep shows that qgroup_softirq in sys/net/iflib.c is used, but nowhere in the codebase is that variable defined.

[lattera]

laptop-dev-02[shawn]:/scratch/freebsd-base-graphics (1) $ grep -rn qgroup_softirq .
grep: ./sys/compat/linuxkpi/common/include/asm/.#bug.h: No such file or directory
./sys/compat/linuxkpi/common/src/linux_tasklet.c:86:            taskqgroup_attach_cpu(qgroup_softirq, gtask, "tasklet", i, -1, buf);
./sys/net/iflib.c:3707: tqg = qgroup_softirq;
./sys/net/iflib.c:4329:         tqg = qgroup_softirq;
./sys/net/iflib.c:4337:         tqg = qgroup_softirq;
./sys/net/iflib.c:4385:         tqg = qgroup_softirq;
./sys/net/iflib.c:4391:         tqg = qgroup_softirq;
./sys/net/iflib.c:4442: tqg = qgroup_softirq;
./sys/net/iflib.c:4458: taskqgroup_attach(qgroup_softirq, &txq->ift_task, txq, tqrid, "tx");
./sys/net/iflib.c:4505: taskqgroup_attach_cpu(qgroup_softirq, gt, uniq, cpu, -1, name);
laptop-dev-02[shawn]:/scratch/freebsd-base-graphics (2) $ git branch
* drm-next-4.7
laptop-dev-02[shawn]:/scratch/freebsd-base-graphics $ git log -n 1 --pretty=oneline | cat
85c2f25cbf8fd30c8a622fba926944524cc72e42 reduce the overhead of sysctl copyout by holding pages instead of wiring them

[jbeich]

Are you trying to rebase code agaist -CURRENT ? Don't touch context, only remove tqrid = irq->ii_rid; line as qgroup_softirq is defined by

sys/kern/subr_gtaskqueue.c:TASKQGROUP_DEFINE(softirq, mp_ncpus, 1);
sys/sys/gtaskqueue.h:TASKQGROUP_DECLARE(softirq);

[lattera]

Yeah. Restoring sys/kern/subr_gtaskqueue.c and sys/net/iflib.c to the version in drm-next-4.7 made compilation happy again.

[lattera]

Built, installed, and tested successfully with the suggestions from @jbeich. Thanks!