diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-09 10:50:17 -0700 |
| commit | e13e75b86ef2f88e3a47d672dd4c52a293efb95b (patch) | |
| tree | 2617aebd952d1aec09d323f6b2484b93f659e753 /kernel/workqueue.c | |
| parent | 1ed41b5696ccc3ff40a1dee39fe14eff273faf82 (diff) | |
| parent | 976431b02c2ef92ae3f8b6a7d699fc554025e118 (diff) | |
Merge branch 'for-4.17/dax' into libnvdimm-for-next
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 6ec6ba65127b..254e636a3d6b 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5573,12 +5573,13 @@ static void __init wq_numa_init(void) int __init workqueue_init_early(void) { int std_nice[NR_STD_WORKER_POOLS] = { 0, HIGHPRI_NICE_LEVEL }; + int hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ; int i, cpu; WARN_ON(__alignof__(struct pool_workqueue) < __alignof__(long long)); BUG_ON(!alloc_cpumask_var(&wq_unbound_cpumask, GFP_KERNEL)); - cpumask_copy(wq_unbound_cpumask, housekeeping_cpumask(HK_FLAG_DOMAIN)); + cpumask_copy(wq_unbound_cpumask, housekeeping_cpumask(hk_flags)); pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC); |