提交 a805cbf4 编写于 作者: L 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
...@@ -3284,6 +3284,7 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) ...@@ -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); kobject_uevent(&wq_dev->dev.kobj, KOBJ_ADD);
return 0; return 0;
} }
...@@ -4879,7 +4880,7 @@ static void __init wq_numa_init(void) ...@@ -4879,7 +4880,7 @@ static void __init wq_numa_init(void)
BUG_ON(!tbl); BUG_ON(!tbl);
for_each_node(node) 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)); node_online(node) ? node : NUMA_NO_NODE));
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册