Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -54,7 +54,7 @@ static struct typedesc_t filetypes[] unused = {
 	{0, NULL}
 };

-#define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) )
+#define CBFS_SUBHEADER(_p) ((void *) ((((uint8_t *) (_p)) + be32toh((_p)->offset))))

 static inline size_t cbfs_file_attr_hash_size(enum vb2_hash_algorithm algo)
 {