summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-20 15:08:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-21 15:05:08 +0200
commitbda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f (patch)
tree41ba79d49c9906cb3766f4fb22be7f5e742f597e
parentvideo: hgafb: correctly handle card detect failure during probe (diff)
downloadlinux-bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f.tar.xz
linux-bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f.zip
kgdb: fix gcc-11 warnings harder
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>
-rw-r--r--drivers/misc/kgdbts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 64d33e368509..67c5b452dd35 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -101,8 +101,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 { \