From patchwork Thu May 20 09:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443223 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2181981jac; Thu, 20 May 2021 04:05:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLj9kALnYKSybGJl33HJxoI/QkxbMNJ1lxrP3Zib0lny2FJ7hC3ybAT2rMQ/33vALZiqV+ X-Received: by 2002:a05:6602:2013:: with SMTP id y19mr4883440iod.71.1621508756785; Thu, 20 May 2021 04:05:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621508756; cv=none; d=google.com; s=arc-20160816; b=lrWP6GW1OmDrpw2Wqpvr808Rjyecuoj6kF5Df8Sqn7zWNSkBRuSqZFHYw1fe3j2w/J b/yYf5U53fxPHTaXmTAbpSH69M6of6kYAwylWO7XXz6BrokhKFVSmv5lmRDehO241TqM g2Jg5oio7+vJAFmMcKSpS58El8X9rSwvnPwTDZJT5SJfQIocybVQXHzkAqnAIkBKNN1I WiFxjNhI/1V19y9tMvaPGTKX1Hn6HD2za+MvrYpJbBI792bcUQzo1WDKIdA7tywWvCS1 9Eh+nMeVELqul8EvlYZXyqI/+TSmuKl2FTenD4bNGywEr+sP8RFx+aelDiJOnmySDCYu qiCA== 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=ZPdvIedMxLHru8ZIAAAHJXlrRkwK3Uwe8ppVongfl5U=; b=0GMF0ccmYCpJRmFfocH3E6/vrAvh6OoxmYq/KuSPmtlZ8ygJHaqQoyT1A3GnBa2VgJ oK0i0g/4X3fx4g15HMb8e9ITFp+K2WvnqowybXLBWXm42GqMvhYd8mFfvlhnb461PQEP 8I/L1V3m0TtSNmRBu9u3UesjvQGRNI60jXfWUS+Qj4RAnVe1o1PHgNWyjd+f1zL1KhGf oH5dSerI0j7M+gjn3faYl/hf09KIKElbCpUoug1vMAJL+MYW1XLnJyH3FhLbC4IBP7cy /4B0X0wqI78SkNVomggQ2y7bhdx5JeTy+1xlxVup4YYfn0s8O6NEMBkXwARnW3/oUMjy Tpag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bHhg5TUm; 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 l17si2014715jaj.81.2021.05.20.04.05.56; Thu, 20 May 2021 04:05:56 -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=bHhg5TUm; 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 S238200AbhETLHQ (ORCPT + 12 others); Thu, 20 May 2021 07:07:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:59406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235259AbhETLFA (ORCPT ); Thu, 20 May 2021 07:05:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CD69761D2B; Thu, 20 May 2021 10:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505106; bh=XmQgosihI8PMEqg8GdiqdEf8AdIq18xjlc027afweOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bHhg5TUmzCzMck29dN03xBba3ljoPvfrfHmQfSotjrwYZ36n9AIPyfgXFVJNTbvHH duH1QTw/yJXeuNCD9GAzUoGvE1Lb1m5C8Btu14aPIDpa+4rKfQHUDib2Q8dlWkCmKh VL8nsXVm9mO3U4fu7Iu8vk4Xinxh6QHxOR1b7SPE= 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.9 226/240] kgdb: fix gcc-11 warning on indentation Date: Thu, 20 May 2021 11:23:38 +0200 Message-Id: <20210520092116.303133897@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@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 @@ -105,19 +105,19 @@ #include #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;