From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 29 May 2021 18:21:30 +0000 (+0200)
Subject: 5.12-stable patches
X-Git-Tag: v4.4.271~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69769cb653b482e4e2c5b57ff5be89069e50ecaa;p=thirdparty%2Fkernel%2Fstable-queue.git

5.12-stable patches

added patches:
	kgdb-fix-gcc-11-warnings-harder.patch
---

diff --git a/queue-5.12/kgdb-fix-gcc-11-warnings-harder.patch b/queue-5.12/kgdb-fix-gcc-11-warnings-harder.patch
new file mode 100644
index 00000000000..fc04982c358
--- /dev/null
+++ b/queue-5.12/kgdb-fix-gcc-11-warnings-harder.patch
@@ -0,0 +1,40 @@
+From bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 20 May 2021 15:08:39 +0200
+Subject: kgdb: fix gcc-11 warnings harder
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f upstream.
+
+40cc3a80bb42 ("kgdb: fix gcc-11 warning on indentation") tried to fix up
+the gcc-11 complaints in this file by just reformatting the #defines.
+That worked for gcc 11.1.0, but in gcc 11.1.1 as shipped by Fedora 34,
+the warning came back for one of the #defines.
+
+Fix this up again by putting { } around the if statement, now it is
+quiet again.
+
+Fixes: 40cc3a80bb42 ("kgdb: fix gcc-11 warning on indentation")
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Daniel Thompson <daniel.thompson@linaro.org>
+Cc: Jason Wessel <jason.wessel@windriver.com>
+Link: https://lore.kernel.org/r/20210520130839.51987-1-gregkh@linuxfoundation.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/misc/kgdbts.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/misc/kgdbts.c
++++ b/drivers/misc/kgdbts.c
+@@ -100,8 +100,9 @@
+ 		printk(KERN_INFO a);	\
+ } while (0)
+ #define v2printk(a...) do {		\
+-	if (verbose > 1)		\
++	if (verbose > 1) {		\
+ 		printk(KERN_INFO a);	\
++	}				\
+ 	touch_nmi_watchdog();		\
+ } while (0)
+ #define eprintk(a...) do {		\
diff --git a/queue-5.12/series b/queue-5.12/series
index aa4bb6967c0..66884ca765c 100644
--- a/queue-5.12/series
+++ b/queue-5.12/series
@@ -58,3 +58,4 @@ drm-amdkfd-correct-sienna_cichlid-sdma-rlc-register-offset-error.patch
 drm-amdgpu-vcn2.0-add-cancel_delayed_work_sync-before-power-gate.patch
 drm-amdgpu-vcn2.5-add-cancel_delayed_work_sync-before-power-gate.patch
 drm-amdgpu-jpeg2.0-add-cancel_delayed_work_sync-before-power-gate.patch
+kgdb-fix-gcc-11-warnings-harder.patch