Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[linux-2.6-block.git] / kernel / workqueue.c

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7368b57842ea349ca0c1183f6999ec7f16e6c647..dde6298f6b221e136fc579a37adc80310f97a8f6 100644 (file)
--- 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;