aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Merhar <mattmerhar@protonmail.com>2021-09-06 19:32:48 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-09-13 17:08:12 +0200
commit55643e469c21ae268cd9842705ae064404094f07 (patch)
treea5efcb645c02e5565a59782edbe31a7b018e51c8
parent1a3b3dc7974c98843baeb22251dc4c580dc771d6 (diff)
downloadupstream-55643e469c21ae268cd9842705ae064404094f07.tar.gz
upstream-55643e469c21ae268cd9842705ae064404094f07.tar.bz2
upstream-55643e469c21ae268cd9842705ae064404094f07.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] Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
-rw-r--r--target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch2
-rw-r--r--target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch
index 1bccb30a69..c794c6fe8f 100644
--- a/target/linux/generic/pending-5.10/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/pending-5.10/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
diff --git a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch
index 052db7ef5c..8bd31d2e7e 100644
--- a/target/linux/generic/pending-5.4/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/pending-5.4/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