Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+2 -1
+2 -1
kernel/workqueue.c
··· 4990 4990 * 4991 4991 * Unbound workqueues have the following extra attributes. 4992 4992 * 4993 - * id RO int : the associated pool ID 4993 + * pool_ids RO int : the associated pool IDs for each node 4994 4994 * nice RW int : nice value of the workers 4995 4995 * cpumask RW mask : bitmask of allowed CPUs for the workers 4996 + * numa RW bool : whether enable NUMA affinity 4996 4997 */ 4997 4998 struct wq_device { 4998 4999 struct workqueue_struct *wq;