Re: [PATCH] kgdb: fix gcc-11 warning on indentation

[Daniel Thompson]

On Mon, Mar 22, 2021 at 05:43:03PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
> 
> gcc-11 starts warning about misleading indentation inside of macros:
> 
> drivers/misc/kgdbts.c: In function ‘kgdbts_break_test’:
> drivers/misc/kgdbts.c:103:9: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]
>   103 |         if (verbose > 1) \
>       |         ^~
> drivers/misc/kgdbts.c:200:9: note: in expansion of macro ‘v2printk’
>   200 |         v2printk("kgdbts: breakpoint complete\n");
>       |         ^~~~~~~~
> drivers/misc/kgdbts.c:105:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’
>   105 |                 touch_nmi_watchdog();   \
>       |                 ^~~~~~~~~~~~~~~~~~
> 
> The code looks correct to me, so just reindent it for readability.
> 
> Fixes: e8d31c204e36 ("kgdb: add kgdb internal test suite")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

Acked-by: Daniel Thompson <daniel.thompson@xxxxxxxxxx>

Which tree do you want to merge this one though? I've got nothing else
pending for this file so I am very relaxed about the route...


Daniel.


> ---
>  drivers/misc/kgdbts.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
> index 945701bce553..2e081a58da6c 100644
> --- a/drivers/misc/kgdbts.c
> +++ b/drivers/misc/kgdbts.c
> @@ -95,19 +95,19 @@
>  
>  #include <asm/sections.h>
>  
> -#define v1printk(a...) do { \
> -	if (verbose) \
> -		printk(KERN_INFO a); \
> -	} while (0)
> -#define v2printk(a...) do { \
> -	if (verbose > 1) \
> -		printk(KERN_INFO a); \
> -		touch_nmi_watchdog();	\
> -	} while (0)
> -#define eprintk(a...) do { \
> -		printk(KERN_ERR a); \
> -		WARN_ON(1); \
> -	} while (0)
> +#define v1printk(a...) do {		\
> +	if (verbose)			\
> +		printk(KERN_INFO a);	\
> +} while (0)
> +#define v2printk(a...) do {		\
> +	if (verbose > 1)		\
> +		printk(KERN_INFO a);	\
> +	touch_nmi_watchdog();		\
> +} while (0)
> +#define eprintk(a...) do {		\
> +	printk(KERN_ERR a);		\
> +	WARN_ON(1);			\
> +} while (0)
>  #define MAX_CONFIG_LEN		40
>  
>  static struct kgdb_io kgdbts_io_ops;
> -- 
> 2.29.2
>