diff --git a/include/linux/exportfs.h b/include/linux/exportfs.h
index fe848901fcc3a..1640d97e4c0dd 100644
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
@@ -131,7 +131,7 @@ struct fid {
  			u32 parent_block;
  			u32 parent_generation;
  		} udf;
-		__u32 raw[0];
+		DECLARE_FLEX_ARRAY(__u32, raw);
 	};
 };
 
diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index c3b4cc84877b5..ad3c388401947 100644
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -135,7 +135,7 @@ struct dev_pagemap {
 	int nr_range;
 	union {
 		struct range range;
-		struct range ranges[0];
+		DECLARE_FLEX_ARRAY(struct range, ranges);
 	};
 };
 
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index b9e555eb68779..cd16ac7ee8499 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -4128,7 +4128,7 @@ static int validate_ibt(struct objtool_file *file)
 		    !strcmp(sec->name, "__ex_table")			||
 		    !strcmp(sec->name, "__jump_table")			||
 		    !strcmp(sec->name, "__mcount_loc")			||
-		    !strcmp(sec->name, ".kcfi_traps"))			||
+		    !strcmp(sec->name, ".kcfi_traps")			||
 		    strstr(sec->name, "__patchable_function_entries"))
 			continue;