[PATCH 1/2] maint: update for linux v6.4-rc6

Gleb Fotengauer-Malinovskiy glebfm at altlinux.org
Mon Jun 12 16:28:03 UTC 2023


* maint/ioctls_sym.sh (process_file): Workaround missing definition of
DECLARE_FLEX_ARRAY macro;  skip the EXT4_IOC32_GROUP_ADD ioctl from
processing due to its broken definition.
---
 maint/ioctls_sym.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index 48c09c469..601368c1e 100755
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -260,6 +260,7 @@ process_file()
 			echo 'struct omap3isp_stat_data_time32 {uint32_t dummy32[4]; uint16_t dummy16[3]; };'
 			;;
 		*linux/platform_data/cros_ec_chardev.h)
+			echo '#define DECLARE_FLEX_ARRAY(TYPE, NAME) __DECLARE_FLEX_ARRAY(TYPE, NAME)'
 			echo 'struct cros_ec_command {uint32_t dummy32[5]; uint8_t dummy8[0]; };'
 			;;
 		*linux/sonet.h)
@@ -419,6 +420,9 @@ process_file()
 			sed -i '/[[:space:]]BTRFS_IOC_[GS]ET_FSLABEL[[:space:]]/d' \
 				"$tmpdir"/header.out
 			;;
+		*linux/ext4.h)
+			sed -i "/[[:space:]]EXT4_IOC32_GROUP_ADD[[:space:]]/d" "$tmpdir"/header.out
+			;;
 		*linux/kvm.h)
 			arm_list='KVM_ARM_[A-Z_]+'
 			ppc_list='KVM_ALLOCATE_RMA|KVM_CREATE_SPAPR_TCE|KVM_CREATE_SPAPR_TCE_64|KVM_PPC_[A-Z1-9_]+'
-- 
glebfm



More information about the Strace-devel mailing list