path: root/kernel
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 14:15:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-15 14:15:21 -0800
commit0be500363c6709032254cd52c8059d9ace61de73 (patch)
treec5842f1bf24d71460a600b298daa98c231c920a8 /kernel
parent1bc03573e1c9024d4e4be97df4a1e0931edbae2c (diff)
parent9a19b463863e757e649c37af245b6af101410c1e (diff)
Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo: "There was a commit to make unbound kworkers respect cpu isolation but it conflicted with the restructuring of cpu isolation and got reverted, so the only thing left is the trivial comment fix. Will retry the cpu isolation change after this merge window" * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: Fix comment for unbound workqueue's attrbutes Revert "workqueue: respect isolated cpus when queueing an unbound work" workqueue: respect isolated cpus when queueing an unbound work
Diffstat (limited to 'kernel')
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7368b57842ea..dde6298f6b22 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4990,9 +4990,10 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask)
* Unbound workqueues have the following extra attributes.
- * id RO int : the associated pool ID
+ * pool_ids RO int : the associated pool IDs for each node
* nice RW int : nice value of the workers
* cpumask RW mask : bitmask of allowed CPUs for the workers
+ * numa RW bool : whether enable NUMA affinity
struct wq_device {
struct workqueue_struct *wq;