Merge pull request #177807 from trofi/fix-__bitwise__-on-linux-headers

linuxHeaders: backport fix to restore __bitwise__ define
This commit is contained in:
Sergei Trofimovich 2022-06-18 06:44:38 +00:00 committed by GitHub
commit bafa0bd32d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions

View file

@ -93,6 +93,9 @@ in {
};
patches = [
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
# 5.19 backport. Can be removed on update.
./restore-__bitwise__.patch
];
};
}

View file

@ -0,0 +1,15 @@
https://github.com/torvalds/linux/commit/caa28984163cb63ea0be4cb8dbf05defdc7303f9
Fixes openiscsi build.
--- 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;