Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0be50036 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1bc03573 9a19b463

kernel/workqueue.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -4990,9 +4990,10 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask) 
 *

 *

 * Unbound workqueues have the following extra attributes.

 * 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

 *  nice	RW int	: nice value of the workers

 *  cpumask	RW mask	: bitmask of allowed CPUs for the workers

 *  cpumask	RW mask	: bitmask of allowed CPUs for the workers

 *  numa	RW bool	: whether enable NUMA affinity

 */

 */

struct wq_device {

struct wq_device {

	struct workqueue_struct		*wq;

	struct workqueue_struct		*wq;