Messages in this thread Patch in this message | | | From | Bjorn Helgaas <> | Subject | [PATCH] Revert "linux/types.h: remove unnecessary __bitwise__" | Date | Wed, 25 May 2022 09:46:38 -0500 |
| |
From: Bjorn Helgaas <bhelgaas@google.com>
This reverts 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.
Link: https://lore.kernel.org/r/b5c0a68d-8387-4909-beea-f70ab9e6e3d5@kernel.org Reported-by: Jiri Slaby <jirislaby@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- include/uapi/linux/types.h | 5 +++-- tools/include/linux/types.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h index c4dc597f3dcf..2415d5dcb5d3 100644 --- a/include/uapi/linux/types.h +++ b/include/uapi/linux/types.h @@ -21,10 +21,11 @@ /* sparse defines __CHECKER__; see Documentation/dev-tools/sparse.rst */ #ifdef __CHECKER__ -#define __bitwise __attribute__((bitwise)) +#define __bitwise__ __attribute__((bitwise)) #else -#define __bitwise +#define __bitwise__ #endif +#define __bitwise __bitwise__ typedef __u16 __bitwise __le16; typedef __u16 __bitwise __be16; diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h index 051fdeaf2670..5908e58c3598 100644 --- a/tools/include/linux/types.h +++ b/tools/include/linux/types.h @@ -43,10 +43,11 @@ typedef __u8 u8; typedef __s8 s8; #ifdef __CHECKER__ -#define __bitwise __attribute__((bitwise)) +#define __bitwise__ __attribute__((bitwise)) #else -#define __bitwise +#define __bitwise__ #endif +#define __bitwise __bitwise__ #define __force #define __user -- 2.25.1
| |