Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCB191841 for ; Thu, 26 May 2022 15:17:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3731BC34114; Thu, 26 May 2022 15:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653578245; bh=JwoKQrS2WF+qGe4jyKO4eVRc1+Zjzv9x2ADz53UC8us=; h=From:To:Cc:Subject:Date:From; b=RxyX9SVIJ164cZ4daW3ZHBaYR1kQnuIuqJAsWnq5G59phgrRcPRO8XZQ9CJvnjLNe rdermwDVjGg/2c+gdKOTjnQksY3rIozXvFXpVMhuRbbUbJItJHdqIqqoP5GSfUpRn7 xLXhwCR9wPykfvZ+a4hogBw4wc05FqsiTtFWXHflGOBO3GDDMkR/q5kNrFfuZ+pQvz B+9/8JAupjyXHpSPif+pRpKdgBz/Lb0VzCWQxcA77PgpsT1xvtvU5jxL/v1vJtBqOT igX9DarTfib6XVsTo7/p5+MXfQnQJJpMoW6MrEbRuTmmSDCkeIlKQxUKHHexFFD7d+ picr0fWsefOBQ== From: Bjorn Helgaas To: Andrew Morton , Jonathan Corbet , Linus Torvalds Cc: Nathan Chancellor , Nick Desaulniers , "Michael S . Tsirkin" , Jiri Slaby , llvm@lists.linux.dev, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2] linux/types.h: Restore __bitwise__ definition Date: Thu, 26 May 2022 10:17:06 -0500 Message-Id: <20220526151706.331557-1-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Helgaas This reverts part of commit c724c866bb70cb8c607081a26823a1f0ebde4387. Jiri Slaby reported that c724c866bb70 ("linux/types.h: remove unnecessary __bitwise__") broke userspace, including open-iscsi, because it uses __bitwise__. Restore the __bitwise__ definition. Suggested-by: Linus Torvalds Link: https://lore.kernel.org/r/b5c0a68d-8387-4909-beea-f70ab9e6e3d5@kernel.org Link: https://lore.kernel.org/r/CAHk-=whk=ygWsxt=1HhndCwjtXdga9sPmkxFGby5PJWRk5yx9Q@mail.gmail.com Reported-by: Jiri Slaby Tested-by: Jiri Slaby Signed-off-by: Bjorn Helgaas --- include/uapi/linux/types.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h index c4dc597f3dcf..308433be33c2 100644 --- a/include/uapi/linux/types.h +++ b/include/uapi/linux/types.h @@ -26,6 +26,9 @@ #define __bitwise #endif +/* The kernel doesn't use this legacy form, but user space does */ +#define __bitwise__ __bitwise + typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; typedef __u32 __bitwise __le32; -- 2.25.1