From patchwork Thu May 20 09:22:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443175 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2115596jac; Thu, 20 May 2021 02:32:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJww/Fj4iz+8RSsYYc6LWln5kU0hhItmRZ9MJZe3EWVUOI5FibCyGJiMKrn1kRDtmSE+eoZU X-Received: by 2002:aa7:c70d:: with SMTP id i13mr3999639edq.340.1621503157581; Thu, 20 May 2021 02:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621503157; cv=none; d=google.com; s=arc-20160816; b=zYvO9N7f794SBpcGMagND52rsFPa8tpeMBydLCuvNOa7V2oMKv5cjlWZ+StSTfBUHf 2IbsNHuMi+7tgWxN3U8xoCyw7KeXYF7dMgtpzGkQSmdOvnNbGRLtSrUZDarDbYx+srOJ nE0xJT/r2vp0AWnDY3UJU3RHp3utaqeKb+BRvj68d0QYoynAE9oycubgwD6WRnQrl2v7 CBqesmDm6rCDmP0IVz2vOdJi8HEunp/3rcB9+BOegm8ediAT7bdmPv2ziKcLXpvVHdIV x3kc0mtAP8p241ZgqL+Pd3yYuZrBjR4mRDoBpmPuV+57/Mm6+aDSL7r43p9o3kxbGT/J jpww== 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=JMQvqQ7lfYQgdjZAxJc3clZbKOYX2C0PL0u9TNteWzA=; b=KKd/rDZOPkapSxkyFkmDeBH0VKN8INrkWyY3/WSTUnkMLzco7YYRiVa4xIV58Ac96v f4WtDSP1TBg0ucUk8ZW4NXjKDwGDfCSBkKZ9EFxWgXNlm6xlorP4TSkB7zWvn0Fwz6/1 StPa5ewoPoSVTayhJY/UIqLNoCN964wAuDsuXTEfaaYii5b9wm3MT2O8X+aDJNOK/MbH k3pvvV/wGkW1onZPxuwS03GwXMUITx0pUTxK/gVmnJqiiKjdgpg5fpLY7X/SJOBo9se/ dfr9kHWtCi4A/BF7VjvQp77dHG4aaFODxKcrrZ9uoeuQaELVr6IHnLdW9x7uBt5PF8lC lRTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qI7+661B; 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 t23si2430765ejs.86.2021.05.20.02.32.37; Thu, 20 May 2021 02:32:37 -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=qI7+661B; 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 S232582AbhETJd5 (ORCPT + 12 others); Thu, 20 May 2021 05:33:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:54548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232053AbhETJcE (ORCPT ); Thu, 20 May 2021 05:32:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 156B4613D9; Thu, 20 May 2021 09:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502896; bh=GGYeuE3Kf1KuUNPDu9rHsOC+PjsoL5g6WqM8hbssvJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qI7+661B9IbFOGbGWE6VJHhvtvn/YDK6C+lnAaEjSb7IZiQSUCnOAbC+8PeGxGpqx L0ImTEMgH0qk2XbXm3hIDPOv867iM3qqXDPW+2n9PV4xe1if5JxgP8Hz2m0ZrfoNQN PVwbZmIVSfCO6sDpYD6C3nf316fPOYP86eyr82Jk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Thompson , Arnd Bergmann Subject: [PATCH 5.4 02/37] kgdb: fix gcc-11 warning on indentation Date: Thu, 20 May 2021 11:22:23 +0200 Message-Id: <20210520092052.350030101@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092052.265851579@linuxfoundation.org> References: <20210520092052.265851579@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 @@ -95,19 +95,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;