]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
workqueue: Fix flag collision
authorBen Hutchings <ben@decadent.org.uk>
Sun, 3 Sep 2017 00:18:41 +0000 (01:18 +0100)
committerTejun Heo <tj@kernel.org>
Tue, 5 Sep 2017 13:34:17 +0000 (06:34 -0700)
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>
include/linux/workqueue.h

index db6dc9dc0482bf1299c010f54873f2ae36a4684e..1c49431f31213fcaef9a57dbaaa4d79325c6cb47 100644 (file)
@@ -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 */