From 6575b42da4ecf47242846ad076de0e76548d3acd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 29 May 2021 20:20:14 +0200 Subject: [PATCH] 4.9-stable patches added patches: kgdb-fix-gcc-11-warnings-harder.patch --- .../kgdb-fix-gcc-11-warnings-harder.patch | 40 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-4.9/kgdb-fix-gcc-11-warnings-harder.patch diff --git a/queue-4.9/kgdb-fix-gcc-11-warnings-harder.patch b/queue-4.9/kgdb-fix-gcc-11-warnings-harder.patch new file mode 100644 index 00000000000..0301a453033 --- /dev/null +++ b/queue-4.9/kgdb-fix-gcc-11-warnings-harder.patch @@ -0,0 +1,40 @@ +From bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 20 May 2021 15:08:39 +0200 +Subject: kgdb: fix gcc-11 warnings harder + +From: Greg Kroah-Hartman + +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 +Cc: Daniel Thompson +Cc: Jason Wessel +Link: https://lore.kernel.org/r/20210520130839.51987-1-gregkh@linuxfoundation.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/kgdbts.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/misc/kgdbts.c ++++ b/drivers/misc/kgdbts.c +@@ -110,8 +110,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-4.9/series b/queue-4.9/series index fdac0507926..353747e5b1b 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -12,3 +12,4 @@ cfg80211-mitigate-a-msdu-aggregation-attacks.patch mac80211-check-defrag-pn-against-current-frame.patch ath10k-validate-first-subframe-of-a-msdu-before-processing-the-list.patch dm-snapshot-properly-fix-a-crash-when-an-origin-has-no-snapshots.patch +kgdb-fix-gcc-11-warnings-harder.patch -- 2.47.3