Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/gustavoars/linux.git
mariux64 · Sep 27, 2022 · dcfe749 · dcfe749
2 parents b08b115 + 0811296
commit dcfe749
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;