4.4-stable patches

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

diff --git a/queue-4.4/makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch b/queue-4.4/makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch
new file mode 100644 (file)
index 0000000..e88a357
--- /dev/null
+++ b/queue-4.4/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
+@@ -716,12 +716,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.4/series b/queue-4.4/series
index d9b3684bce42bdf498158dee8e9b71c814b128cd..040d0bccdac4a45cd36e0bec28cfc8ed56361b24 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -41,3 +41,4 @@ tracing-do-not-stop-recording-comms-if-the-trace-file-is-being-read.patch
 x86-fpu-reset-state-for-all-signal-restore-failures.patch
 inet-use-bigger-hash-table-for-ip-id-generation.patch
 arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch
+makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch