aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMatt Merhar <mattmerhar@protonmail.com>2023-10-28 21:15:46 -0400
committerChristian Marangi <ansuelsmth@gmail.com>2023-10-29 11:32:57 +0100
commitaaa1286b89a058bab2d23f55182453bf1f5a5e69 (patch)
tree257c5f8b3c247e303107ec62cf6861d59a90618f /target
parent5368066e9b83bfc7529cba9d8890bf06c23b62bd (diff)
downloadupstream-aaa1286b89a058bab2d23f55182453bf1f5a5e69.tar.gz
upstream-aaa1286b89a058bab2d23f55182453bf1f5a5e69.tar.bz2
upstream-aaa1286b89a058bab2d23f55182453bf1f5a5e69.zip
kernel: fix jffs2 compilation with GCC_PLUGIN_RANDSTRUCT enabled
Designated initializers are required when using the randstruct GCC plugin, otherwise an error like the following is seen: ./include/linux/lzma.h:60:31: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] This was originally applied via 55643e469c21, but was unintentionally reverted in 483503603cb2. Fixes: 483503603cb2 ("generic: 5.15: rework pending patch") Signed-off-by: Matt Merhar <mattmerhar@protonmail.com> (cherry picked from commit b2068f4aac43754a681b675ff3814d9ca87ac986) [ drop change for unavailable kernel 6.1 ] Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch
index ac784d0b0b..f236657b71 100644
--- a/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/pending-5.15/530-jffs2_make_lzma_available.patch
@@ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
+ LZMA_FREE(address);
+}
+
-+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
++static ISzAlloc lzma_alloc = { .Alloc = p_lzma_malloc, .Free = p_lzma_free };
+
+#endif
--- /dev/null