From patchwork Thu May 20 09:22:44 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: 443202 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2145431jac; Thu, 20 May 2021 03:14:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzy6fJvM1OcC/PIsWpRYsYJlqk2P0lHl/GYRvNQ+jyQk/AtHQCLzJ8dPo7Wnv/G/pTvY8EF X-Received: by 2002:a92:cf45:: with SMTP id c5mr4638795ilr.182.1621505666069; Thu, 20 May 2021 03:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621505666; cv=none; d=google.com; s=arc-20160816; b=EWCrRYojN+25AOT06GVOPW6aEB+p8mRfb/j3hDpvErTpYAke02oKt2NV4yAV2NXDLv BELP1OY30PXBkHCLiUWsBoGGU2Qr+f46MbP62w5FcPHg5n0w0aACGRS/fZwTZ+QRMpAm kTfmek0qUvIHwm+XRcw70dzy25iDkLI7UV8haSpqKnnvAyB0e4O2BV9yLI94ce720EHM F86EtbumPCypl1XO8PLZ8IZvTu8gvVqaUWKRcN34osfGUegfLyacRPQZ4dzr0OyCj9q0 INqxxmeY/0vP9XSkiK+JsBaxV9YHVXLYQRhqusnuMJl9Ws17zFHEJtthqTNC5bkYJoQl XbZA== 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=UF011WQ/GCO5naK9vNAyfYovHvy6O7QmsqpwTenU0U9V8vqBCC0XnlDBky8FdLgDcB dQ1wq1M3TNieHiCJCdUDahjGIZJmk0VFN2ONozDnpFnmkw2ovjQYcljUFWJOUzrHfQqb sYR+L+YV5VPtbtWeBGP4DAVRtS3wwe7A+xW1iyO1ZdYw8l1LmTn7wQR3Z2mKh96sOwin wv8QTeMhMgan9s/zOfvQF3gS5xklR4wCY0LalVUY1nApAHItxjYl6ebUpFvSQXF/ODj3 UOiV3luMy9OmJh/8IopwrsJPtBw374L67QjQKaM1M16c9xLp4aQW63tRyBvWOalHxkEj cJBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wMmPz1Bi; 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 b26si1907477ios.29.2021.05.20.03.14.25; Thu, 20 May 2021 03:14:26 -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=wMmPz1Bi; 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 S235147AbhETKPf (ORCPT + 12 others); Thu, 20 May 2021 06:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:43944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235702AbhETKMH (ORCPT ); Thu, 20 May 2021 06:12:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FA8161971; Thu, 20 May 2021 09:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503825; bh=1FMfuSkphlXgWf6giN3xc1cdi3gtXazWI9ZFJ23i7ms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wMmPz1BipXfe8tFR5NkMwhZq+mJjFWcU8/G71OBuNqPTlC2tdL8fq1XAFv7AD1Cn5 xppr1WjBi47qCqI5aM2ZRbA5Su0UYEnoNBRCIwX2YECK5FU8HrrtyzyjRUfTfoYOt8 GTQSS75cqYH/q7nlOp7HS0mBWbx65qr0wmq2Z2l4= 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.19 395/425] kgdb: fix gcc-11 warning on indentation Date: Thu, 20 May 2021 11:22:44 +0200 Message-Id: <20210520092144.385889280@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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;