]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 May 2022 12:37:30 +0000 (14:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 May 2022 12:37:30 +0000 (14:37 +0200)
added patches:
mips-fix-build-with-gcc-12.patch

queue-5.4/mips-fix-build-with-gcc-12.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/mips-fix-build-with-gcc-12.patch b/queue-5.4/mips-fix-build-with-gcc-12.patch
new file mode 100644 (file)
index 0000000..a3fa787
--- /dev/null
@@ -0,0 +1,37 @@
+From sudipm.mukherjee@gmail.com  Mon May 16 14:32:20 2022
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Sat, 14 May 2022 16:47:30 +0100
+Subject: MIPS: fix build with gcc-12
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Message-ID: <20220514154730.6924-1-sudipm.mukherjee@gmail.com>
+
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+Some mips builds with gcc-12 fails with the error:
+arch/mips/jz4740/setup.c:64:25: error: comparison between two arrays
+       [-Werror=array-compare]
+       64 |         if (__dtb_start != __dtb_end)
+
+'d24f48767d5e ("MIPS: Use address-of operator on section symbols")' has
+been applied which fixes most of the error, but it missed one file which
+was not available upstream when the change was done.
+
+Fixes: d24f48767d5e ("MIPS: Use address-of operator on section symbols")
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/jz4740/setup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/jz4740/setup.c
++++ b/arch/mips/jz4740/setup.c
+@@ -61,7 +61,7 @@ void __init plat_mem_setup(void)
+       jz4740_reset_init();
+-      if (__dtb_start != __dtb_end)
++      if (&__dtb_start != &__dtb_end)
+               dtb = __dtb_start;
+       else
+               dtb = (void *)fw_passed_dtb;
index 591e7475b444a279a3be166cbdb50a60dd6b568c..d10a7fdbd5d8d7968652360a80ea8c14b6e608eb 100644 (file)
@@ -36,3 +36,4 @@ drm-nouveau-tegra-stop-using-iommu_present.patch
 i40e-i40e_main-fix-a-missing-check-on-list-iterator.patch
 cgroup-cpuset-remove-cpus_allowed-mems_allowed-setup-in-cpuset_init_smp.patch
 drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch
+mips-fix-build-with-gcc-12.patch