From patchwork Thu May 20 09:23:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443215 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2164978jac; Thu, 20 May 2021 03:42:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpu6AKdjKzTlJ+twE1LdqlwGUGJPNBc7sXq7fiHAou3JHpIj2vb1iy+56B+K5V4eArcMI8 X-Received: by 2002:a17:906:60d6:: with SMTP id f22mr4054747ejk.177.1621507352293; Thu, 20 May 2021 03:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621507352; cv=none; d=google.com; s=arc-20160816; b=Vvn0/Muf2QmCcXuXAd+Hiq23d5mGxufv74waaT9BsbU2bebVFol2LC/p6pCAUC3kwY lR/nWAzvvKoLSRUnKe/JM1t1JU4PwWgFiZjlS8n8rMv2P5DfSjJTkMLZY+j7TQ4XKjun FMGJjb9nGRh+Z6R9nDK4J0SedeQv4t6vrVI16jc7az7lSzTXKTcBPn4YL2Dt2UrY8BKF ih+1/PKFi/X4tEtkanNlS0lCHWC+z8/dUUkyxWsmZqd9Xu03vgfB9J9UZBvF9cmzgQzU 0xzusG46BAvi6T8f58TSIbC9NKZCXWRGx3r4b/eqv6VmJ1gaPosVZy/oXtQkanYjkFKJ kkRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nn2dIiv7aZIVuAYXTu9Bs0rYTEpUaAB++L4AxiFqzZU=; b=cYTe2RzeBLeRqXcPGjzcymyPMKPBPp7NI9q2BH4348FYNn6XWxrJqs23UD5YgVpj6K szCyEu3mt6tMzJYiIaspSws39BZ+3cMl70LGDUVZ3ArX6F4YDYfehOuxJROQ3y1/ZS6q 8iJ0aCqmTl9RXRqTyxjxTTqOU+8xwHGK1h0L06LGcxkBwm0lYoc6xsh5dQTgcMFg2/DA isoGODLQCEGhBBV9mQwx13n6F+V7jk4q4Y6SNwQ6C6L4UDWJj6wdJeH4Wk9RSDTdOjG4 TXAkAm1Z+YqwzXjXCmI1R4/xReSHwbm4t43MdKozIbGAfkOCDLyr2BAPvhIhr6Qa0m6V mszQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="q/0PBufm"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t16si2432086edi.299.2021.05.20.03.42.32; Thu, 20 May 2021 03:42:32 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="q/0PBufm"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237858AbhETKnv (ORCPT + 12 others); Thu, 20 May 2021 06:43:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:44686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237552AbhETKln (ORCPT ); Thu, 20 May 2021 06:41:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D846D61C87; Thu, 20 May 2021 09:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504565; bh=1FMfuSkphlXgWf6giN3xc1cdi3gtXazWI9ZFJ23i7ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q/0PBufmnA2kehypFsrWvWSGw+ZPYTKK00Ie3CZEqO5uxjB02+xMjq0uGuY8IVz9Y n7nixuTV19KR+NsGDWxJH8RpbRzDIqpySF+sAZRGZNbvppBNrkTVBQJEn+u4WGzNu8 rJC2zMdB68+WiVbr3EwzUg4l8lWz+56Q/xY6brbs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Thompson , Arnd Bergmann Subject: [PATCH 4.14 303/323] kgdb: fix gcc-11 warning on indentation Date: Thu, 20 May 2021 11:23:15 +0200 Message-Id: <20210520092130.624262685@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 40cc3a80bb42587db1e6ae21d6f3090582d33e89 upstream. 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") Acked-by: Daniel Thompson Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210322164308.827846-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/misc/kgdbts.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c @@ -107,19 +107,19 @@ #include -#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;