mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
linuxHeaders: backport fix to restore __bitwise__ define
Without it openiscsi build fails in staging-next as: ../../include/iscsi_proto.h:550:9: error: unknown type name 'itt_t' 550 | itt_t itt; /* Initiator Task Tag */ | ^~~~~
This commit is contained in:
parent
5917794eda
commit
912eb001da
@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -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;
|
Loading…
Reference in New Issue
Block a user