Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf1c41f authored by Ben Hutchings's avatar Ben Hutchings Committed by Tejun Heo
Browse files

workqueue: Fix flag collision 



Commit 0a94efb5 ("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: 0a94efb5 ("workqueue: implicit ordered attribute should be ...")
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: stable@vger.kernel.org # v4.13
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 058fc47e

include/linux/workqueue.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */