Commit a805cbf4 authored Jul 10, 2014 by Linus Torvalds

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

Pull workqueue fixes from Tejun Heo:
 "Two workqueue fixes.  Both are one liners.  One fixes missing uevent
  for workqueue files on sysfs.  The other one fixes missing zeroing of
  NUMA cpu masks which can lead to oopses among other things"

* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: zero cpumask of wq_numa_possible_cpumask on init
  workqueue: fix dev_set_uevent_suppress() imbalance

parents b3e87bdd 5a6024f1

kernel/workqueue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3284,6 +3284,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq)
		}
		}

		dev_set_uevent_suppress(&wq_dev->dev, false);
		kobject_uevent(&wq_dev->dev.kobj, KOBJ_ADD);
		return 0;
		}
		@@ -4879,7 +4880,7 @@ static void __init wq_numa_init(void)
		BUG_ON(!tbl);

		for_each_node(node)
		BUG_ON(!alloc_cpumask_var_node(&tbl[node], GFP_KERNEL,
		BUG_ON(!zalloc_cpumask_var_node(&tbl[node], GFP_KERNEL,
		node_online(node) ? node : NUMA_NO_NODE));

		for_each_possible_cpu(cpu) {

Admin message