diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-09-03 01:18:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-13 14:03:46 -0700 |
| commit | 18f9ff5c8ad53a70aff203d79dc76fada3829101 (patch) | |
| tree | 7ed88e6a781613c4df8ea80505023cf5627decfc /include | |
| parent | e7023d138bb0edf64ee36aa7a7d1dc124cfdacdd (diff) | |
| download | linux-stable-18f9ff5c8ad53a70aff203d79dc76fada3829101.tar.gz linux-stable-18f9ff5c8ad53a70aff203d79dc76fada3829101.tar.bz2 linux-stable-18f9ff5c8ad53a70aff203d79dc76fada3829101.zip | |
workqueue: Fix flag collision
commit fbf1c41fc0f4d3574ac2377245efd666c1fa3075 upstream.
Commit 0a94efb5acbb ("workqueue: implicit ordered attribute should be
overridable") introduced a __WQ_ORDERED_EXPLICIT flag but gave it the
same value as __WQ_LEGACY. I don't believe these were intended to
mean the same thing, so renumber __WQ_ORDERED_EXPLICIT.
Fixes: 0a94efb5acbb ("workqueue: implicit ordered attribute should be ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/workqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index fa25f353f985..ce08e1b65f33 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -315,7 +315,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_ORDERED_EXPLICIT = 1 << 19, /* internal: alloc_ordered_workqueue() */ WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */ |