diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 08:59:16 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-21 09:01:16 +0200 |
| commit | d0d5864676dbccfb1337864a0ae6ce97e6342678 (patch) | |
| tree | 7caa674ec05a1797054cd4304f0a047b6dacddd6 /kernel/workqueue.c | |
| parent | mtd: cfi_cmdset_0002: fix do_write_buffer() timeout error (diff) | |
| parent | Linux 3.16-rc6 (diff) | |
| download | linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.tar.xz linux-d0d5864676dbccfb1337864a0ae6ce97e6342678.zip | |
Merge tag 'v3.16-rc6' into MTD development branch
Linux 3.16-rc6
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 6203d2900877..35974ac69600 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -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) { |