From: Greg Kroah-Hartman Date: Mon, 16 May 2022 12:37:30 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.9.315~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=565735c70ca69503bae5a22630eb6dc8aca8fad3;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: mips-fix-build-with-gcc-12.patch --- 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 index 00000000000..a3fa7878d6d --- /dev/null +++ b/queue-5.4/mips-fix-build-with-gcc-12.patch @@ -0,0 +1,37 @@ +From sudipm.mukherjee@gmail.com Mon May 16 14:32:20 2022 +From: Sudip Mukherjee +Date: Sat, 14 May 2022 16:47:30 +0100 +Subject: MIPS: fix build with gcc-12 +To: Greg Kroah-Hartman +Cc: stable@vger.kernel.org, Sudip Mukherjee +Message-ID: <20220514154730.6924-1-sudipm.mukherjee@gmail.com> + +From: Sudip Mukherjee + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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; diff --git a/queue-5.4/series b/queue-5.4/series index 591e7475b44..d10a7fdbd5d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -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