From patchwork Wed May 12 14:40:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435623 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5079872jao; Wed, 12 May 2021 11:32:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhiD5+u3zrtWnPYidQJJVRDpwQU5kphdgB/c+TG8H5wg3F+GbI8ldrcDqWX9rRx4zcrTOz X-Received: by 2002:a6b:e719:: with SMTP id b25mr26361056ioh.49.1620844337147; Wed, 12 May 2021 11:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620844337; cv=none; d=google.com; s=arc-20160816; b=bMG7QeafCPBhzbxC0pnr1AVvHFEpOedTwNhSetCC6R/ESqGY2oV0GIsEFcCm30aRsV 4NipxLx07arIAUzZPV9EEmyiSQljWeOapDOKbBA7UHJzl3rzHVOYwoGHDBpO9ULaIKt/ j5e8DtJ46DgtixNNyFgDkxFHJkpk+iT4xIxeQ/cpPjogO1SRZcCyr2drHH8IZuxh1blS 3zbeoyRvkY6SKrKzZhljSusTCGlYoS9mNRco+VEdGGYY752MOKccrwSvMQvQI+4+YNm+ V/vFeOacr2Q53gooQmjVx3scvsSpn8W8oOSsRodHhBzgBUT2JQmjYt3brxFQWg00tANR DT/w== 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=42u4FRZbPeyBhYoIR2Vvuycql7qA0MMmdUWNnynQPhE=; b=mWHeVwzU57osDOTfPVVobVaAA98rzGXXI4sA958jxDgxQEsikEyjgfuYJgGGYFOa6o 0dudxdlK1oOr0/movrL7XQb79aXNqV899RxSvMHQrLyc/PgoaKHH9scQ9gKQidyIP99f 9KkE5PVJZsMiyQHSqmEBWTkLewNoYOY+vHsJKBoMoc0Xk2lKJdoXaMuP4Y/rA8OEsV6F cZNUEpDvdTjbDSLoeuEAuxRCnurYZetr6av8dKuTQJBFzrLrF2a39GRABx1gujQDWBva H/rrnowxyd7wijxWMqqnL1LOW+YQJzqsB6ViiA6Qp9iSOt1/6CLn9AIh3e6XRVv9X70V /t7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kDDVRnPd; 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 q8si330223ior.12.2021.05.12.11.32.16; Wed, 12 May 2021 11:32:17 -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=kDDVRnPd; 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 S242741AbhELQfi (ORCPT + 12 others); Wed, 12 May 2021 12:35:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:42822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241269AbhELQ06 (ORCPT ); Wed, 12 May 2021 12:26:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB38861482; Wed, 12 May 2021 15:51:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834664; bh=SbmBVnWx0ZTxTl+SNx37/2ZOjZ/08SaEapoZDvz6vhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kDDVRnPdiC4XEDsYzco2hVpL/KpDcxQw5iJ1TSPiN7f9U9ESyBFh8P61AESMnzoyU d2RyrmiDR/7XuD7p19sdYEu2rFWbqPN5exjmClrHlMdHXqG8Uv1wjKS6BIkS1sJpNk TxGIlbfhpFBpBboTYAzLFKmMqELn5sR8INl5y6FM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leo Yan , Mike Leach , Mathieu Poirier Subject: [PATCH 5.12 005/677] coresight: etm-perf: Fix define build issue when built as module Date: Wed, 12 May 2021 16:40:51 +0200 Message-Id: <20210512144837.391014154@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mike Leach commit 9204ff94868496f2d9b8b173af52ec455160c364 upstream. CONFIG_CORESIGHT_SOURCE_ETM4X is undefined when built as module, CONFIG_CORESIGHT_SOURCE_ETM4X_MODULE is defined instead. Therefore code in format_attr_contextid_show() not correctly complied when coresight built as module. Use IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X) to correct this. Link: https://lore.kernel.org/r/20210414194808.22872-1-mike.leach@linaro.org Fixes: 88f11864cf1d ("coresight: etm-perf: Support PID tracing for kernel at EL2") Reviewed-by: Leo Yan Signed-off-by: Mike Leach Signed-off-by: Mathieu Poirier Cc: stable Link: https://lore.kernel.org/r/20210415202404.945368-2-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -52,7 +52,7 @@ static ssize_t format_attr_contextid_sho { int pid_fmt = ETM_OPT_CTXTID; -#if defined(CONFIG_CORESIGHT_SOURCE_ETM4X) +#if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X) pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID; #endif return sprintf(page, "config:%d\n", pid_fmt);