From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> 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 <torvalds@xxxxxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/b5c0a68d-8387-4909-beea-f70ab9e6e3d5@xxxxxxxxxx Link: https://lore.kernel.org/r/CAHk-=whk=ygWsxt=1HhndCwjtXdga9sPmkxFGby5PJWRk5yx9Q@xxxxxxxxxxxxxx Reported-by: Jiri Slaby <jirislaby@xxxxxxxxxx> Tested-by: Jiri Slaby <jirislaby@xxxxxxxxxx> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> --- 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