From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752811AbdICASu (ORCPT ); Sat, 2 Sep 2017 20:18:50 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:50360 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752707AbdICASs (ORCPT ); Sat, 2 Sep 2017 20:18:48 -0400 Date: Sun, 3 Sep 2017 01:18:41 +0100 From: Ben Hutchings To: Tejun Heo Cc: Lai Jiangshan , linux-kernel@vger.kernel.org, stable@vger.kernel.org Message-ID: <20170903001841.GM18698@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="YzdYn+D7cUqe+VA3" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH] workqueue: Fix flag collision X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --YzdYn+D7cUqe+VA3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 Cc: stable@vger.kernel.org --- include/linux/workqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { =20 __WQ_DRAINING =3D 1 << 16, /* internal: workqueue is draining */ __WQ_ORDERED =3D 1 << 17, /* internal: workqueue is ordered */ - __WQ_ORDERED_EXPLICIT =3D 1 << 18, /* internal: alloc_ordered_workqueue()= */ __WQ_LEGACY =3D 1 << 18, /* internal: create*_workqueue() */ + __WQ_ORDERED_EXPLICIT =3D 1 << 19, /* internal: alloc_ordered_workqueue()= */ =20 WQ_MAX_ACTIVE =3D 512, /* I like 512, better ideas? */ WQ_MAX_UNBOUND_PER_CPU =3D 4, /* 4 * #cpus for unbound wq */ --YzdYn+D7cUqe+VA3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBWatKYee/yOyVhhEJAQo2KBAAoXJQ7QC8DwfKBaihEMM/l50l3olzrbhD CRlLvtze1XPU/l9qFO1t1hMZptj96xYgo2eY+svxDM9tEIar2TaZJ6k29RWFofuP FBf3JFu2b9fekeehLgLi0EZmecDgbvQ/mfyZqqDKBVciFmTnI0WHe8Ql2ejP+bnf ov87JfnDBGCpKbd4z+LZN450hsIIifM9WfF8agjEBj2hnp0Gok+u7hkb4E9KHrDj 0Fkxryjiy+6mjcfpv6ql40RpcSMNts2If1htAUci1pSIRIdZbck96dLFVk+Sk3Ov Vv7sw94BfN8Xt1+EnM9YHnFT60ML0UQQrKtfMUDq3s9MT/7lSBnTBlQlKcIZZjnY 8+L3jXUxO8f0BMTLFB0mGRyIik2BTUBv3zw5iP0Wk3X4M246sooprZDlfYJq1/CM XxL82ZsKe/Ll+4k/qdfEKhh4641SNtKfuL+56ZI5oaf9yhEeAloe+VYXRacsOMdG WwpKTw3iecBxEvoAK5OTHOWaJ7t1f/O12TRDddGap4E6gW5hx8GH8POPU2DJmZmE /Pfyd+lFkQ9IUSSV4GJ4WMsNMszLa7SaalT+if0O1aTmfU+kcikotpRJBb0bEiCg kSkxVUxIHxthPc5SKyBfa7qz5znWCLZ+Mo3kPvh/4soycULLtFsIEyi7sOD5DFW7 8CWizsgZGc0= =PgUA -----END PGP SIGNATURE----- --YzdYn+D7cUqe+VA3--