Skip to content

Commit 0e94513

Browse files
committed
Merge tag 'wq-for-6.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo: - Remove double allocation of wq_update_pod_attrs_buf - Fix missing allocation of pwq_release_worker when wq_cpu_intensive_thresh_us is set to a custom value * tag 'wq-for-6.6-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: Fix missed pwq_release_worker creation in wq_cpu_intensive_thresh_init() workqueue: Removed double allocation of wq_update_pod_attrs_buf
2 parents cac405a + dd64c87 commit 0e94513

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

kernel/workqueue.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6535,9 +6535,6 @@ void __init workqueue_init_early(void)
65356535

65366536
BUG_ON(!zalloc_cpumask_var_node(&pt->pod_cpus[0], GFP_KERNEL, NUMA_NO_NODE));
65376537

6538-
wq_update_pod_attrs_buf = alloc_workqueue_attrs();
6539-
BUG_ON(!wq_update_pod_attrs_buf);
6540-
65416538
pt->nr_pods = 1;
65426539
cpumask_copy(pt->pod_cpus[0], cpu_possible_mask);
65436540
pt->pod_node[0] = NUMA_NO_NODE;
@@ -6605,13 +6602,13 @@ static void __init wq_cpu_intensive_thresh_init(void)
66056602
unsigned long thresh;
66066603
unsigned long bogo;
66076604

6605+
pwq_release_worker = kthread_create_worker(0, "pool_workqueue_release");
6606+
BUG_ON(IS_ERR(pwq_release_worker));
6607+
66086608
/* if the user set it to a specific value, keep it */
66096609
if (wq_cpu_intensive_thresh_us != ULONG_MAX)
66106610
return;
66116611

6612-
pwq_release_worker = kthread_create_worker(0, "pool_workqueue_release");
6613-
BUG_ON(IS_ERR(pwq_release_worker));
6614-
66156612
/*
66166613
* The default of 10ms is derived from the fact that most modern (as of
66176614
* 2023) processors can do a lot in 10ms and that it's just below what

0 commit comments

Comments
 (0)