4.9-stable patches

added patches:
	makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch

diff --git a/queue-4.9/makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch b/queue-4.9/makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch
new file mode 100644 (file)
index 0000000..b961913
--- /dev/null
+++ b/queue-4.9/makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch
@@ -0,0 +1,45 @@
+From 885480b084696331bea61a4f7eba10652999a9c1 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Wed, 28 Apr 2021 18:23:50 -0700
+Subject: Makefile: Move -Wno-unused-but-set-variable out of GCC only block
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit 885480b084696331bea61a4f7eba10652999a9c1 upstream.
+
+Currently, -Wunused-but-set-variable is only supported by GCC so it is
+disabled unconditionally in a GCC only block (it is enabled with W=1).
+clang currently has its implementation for this warning in review so
+preemptively move this statement out of the GCC only block and wrap it
+with cc-disable-warning so that both compilers function the same.
+
+Cc: stable@vger.kernel.org
+Link: https://reviews.llvm.org/D100581
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
+Tested-by: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+[nc: Backport, workaround lack of e2079e93f562 in older branches]
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Makefile |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -718,12 +718,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni
+ # See modpost pattern 2
+ KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
+ KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
+-else
++endif
+ 
+ # These warnings generated too much noise in a regular build.
+ # Use make W=1 to enable them (see scripts/Makefile.extrawarn)
+ KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
+-endif
+ 
+ KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
+ ifdef CONFIG_FRAME_POINTER

diff --git a/queue-4.9/series b/queue-4.9/series
index 613484255d136e34556db86d556f80e3aeeffaff..cb13f8fe63ed1240a9e4a23cfb7ae75fc2f71191 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -50,3 +50,4 @@ x86-fpu-reset-state-for-all-signal-restore-failures.patch
 inet-use-bigger-hash-table-for-ip-id-generation.patch
 i40e-be-much-more-verbose-about-what-we-can-and-cannot-offload.patch
 arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch
+makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch