Skip to content

Commit 3023649

Browse files
bwhacksgregkh
authored andcommitted
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>
1 parent 966e3a2 commit 3023649

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/linux/workqueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ enum {
311311

312312
__WQ_DRAINING = 1 << 16, /* internal: workqueue is draining */
313313
__WQ_ORDERED = 1 << 17, /* internal: workqueue is ordered */
314-
__WQ_ORDERED_EXPLICIT = 1 << 18, /* internal: alloc_ordered_workqueue() */
314+
__WQ_ORDERED_EXPLICIT = 1 << 19, /* internal: alloc_ordered_workqueue() */
315315

316316
WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */
317317
WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */

0 commit comments

Comments
 (0)