The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1f336704d308679d4178fd5063dba854b22a07b
commit e1f336704d308679d4178fd5063dba854b22a07b Author: Mark Johnston <[email protected]> AuthorDate: 2023-12-31 16:36:12 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2023-12-31 16:49:08 +0000 gtaskqueue: Fix a typo This is a no-op in practice since gtaskqueue_thread_enqueue() and taskqueue_thread_enqueue() are identical, and while _gtaskqueue_create() compares the enqueue callback pointer with gtaskqueue_thread_enqueue(), the result has no effect since TQ_FLAGS_UNLOCKED_ENQUEUE was copied directly from subr_taskqueue.c and is unused in the gtaskqueue code. Fix it anyway since it's a bug. More generally we really need to consolidate subr_taskqueue.c and subr_gtaskqueue.c. PR: 270661 MFC after: 1 week --- sys/kern/subr_gtaskqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_gtaskqueue.c b/sys/kern/subr_gtaskqueue.c index e68e1b9318fa..120ffaba874a 100644 --- a/sys/kern/subr_gtaskqueue.c +++ b/sys/kern/subr_gtaskqueue.c @@ -613,7 +613,7 @@ taskqgroup_cpu_create(struct taskqgroup *qgroup, int idx, int cpu) qcpu = &qgroup->tqg_queue[idx]; LIST_INIT(&qcpu->tgc_tasks); qcpu->tgc_taskq = gtaskqueue_create_fast(NULL, M_WAITOK, - taskqueue_thread_enqueue, &qcpu->tgc_taskq); + gtaskqueue_thread_enqueue, &qcpu->tgc_taskq); gtaskqueue_start_threads(&qcpu->tgc_taskq, 1, PI_SOFT, "%s_%d", qgroup->tqg_name, idx); qcpu->tgc_cpu = cpu;
