diff options
| author |   Ben Hutchings <ben@decadent.org.uk> | 2017-09-03 01:18:41 +0100 |
|---|---|---|
| committer |   Tejun Heo <tj@kernel.org> | 2017-09-05 06:34:17 -0700 |
| commit | fbf1c41fc0f4d3574ac2377245efd666c1fa3075 (patch) | |
| tree | ed554b2930bd7e23bbd0c37f166e8a1774bc17a9 /include/linux/workqueue.h | |
| parent | Merge branch 'for-4.13-fixes' into for-4.14 (diff) | |
| download | linux-dev-fbf1c41fc0f4d3574ac2377245efd666c1fa3075.tar.xz linux-dev-fbf1c41fc0f4d3574ac2377245efd666c1fa3075.zip | |
workqueue: Fix flag collision
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>
Cc: stable@vger.kernel.org # v4.13
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/workqueue.h')
| -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 db6dc9dc0482..1c49431f3121 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -323,8 +323,8 @@ 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_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 */ |