diff options
| author |   Tejun Heo <tj@kernel.org> | 2017-09-05 06:33:41 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-09-05 06:33:41 -0700 |
| commit | 058fc47ee22c60c817c362ef6844d40d8ebb8140 (patch) | |
| tree | da0bf3dec31d4c30a5420930cd11a5c2cdc5e46b /include/linux/workqueue.h | |
| parent | workqueue: Use TASK_IDLE (diff) | |
| parent | workqueue: Work around edge cases for calc of pool's cpumask (diff) | |
| download | linux-rng-058fc47ee22c60c817c362ef6844d40d8ebb8140.tar.xz linux-rng-058fc47ee22c60c817c362ef6844d40d8ebb8140.zip | |
Merge branch 'for-4.13-fixes' into for-4.14
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index c102ef65cb64..db6dc9dc0482 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -323,6 +323,7 @@ enum { __WQ_DRAINING = 1 << 16, /* internal: workqueue is draining */ __WQ_ORDERED = 1 << 17, /* internal: workqueue is ordered */ + __WQ_ORDERED_EXPLICIT = 1 << 18, /* internal: alloc_ordered_workqueue() */ __WQ_LEGACY = 1 << 18, /* internal: create*_workqueue() */ WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ @@ -422,7 +423,8 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, * Pointer to the allocated workqueue on success, %NULL on failure. */ #define alloc_ordered_workqueue(fmt, flags, args...) \ - alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args) + alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | \ + __WQ_ORDERED_EXPLICIT | (flags), 1, ##args) #define create_workqueue(name) \ alloc_workqueue("%s", __WQ_LEGACY | WQ_MEM_RECLAIM, 1, (name)) |