From patchwork Wed Sep 22 17:00:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12511047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23134C433F5 for ; Wed, 22 Sep 2021 17:06:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E646F60240 for ; Wed, 22 Sep 2021 17:06:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E646F60240 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XXEEXeMXaVG3O52TKps+UtFrUNpKZB7i1eccfWiBl0s=; b=x2vwg6yptE8ZKP rNA9/QGTeX2t24IsGANzBv8ixHGYOzmiD8o9Z3GXcSVI9xE3FeG4YdMruMnjlUsJqquxnBToVtFyY cq1TEhaufFb0/QmVYv13IYvKeALOLUEgYt8VFBKpHPRZyjeDvZu4btZUhdn/hxPG5jMVKbvaGOMxJ iiL1BIXNdFXMBEi5954qGx6n45hhbIx6VHX/0rayZH+DPULvLWQbQM6SKmZQ8LKK6e8QsVDiN2irm 8HTFz4TW5BT6aFif/VrXNXXu5hwAEkueDfO/pk07Vp7IgLLMvgQHkJhXXac18KW2ZS9/NaouG84Xm IRphozC1f/F0Mqg0ie2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5fz-009Dl5-Ia; Wed, 22 Sep 2021 17:04:56 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5cd-009C9Z-Qv for linux-arm-kernel@lists.infradead.org; Wed, 22 Sep 2021 17:01:29 +0000 Received: by mail-pj1-x1034.google.com with SMTP id k23-20020a17090a591700b001976d2db364so2811862pji.2 for ; Wed, 22 Sep 2021 10:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a/ftcT1Si5LLqrGRd7+ykyLXm/kzJfgC1iySzpAzFqo=; b=j7q6p/LWwo6ESmjJq+GhqTt1eYjOuU8ON1WGKI2/KgW2x96nfl8wlo4D+uQo1aRV90 Z901/KLZfoVHE4ha3BzFrbj6ikMcZnMLfO1mZhNsQdsQO96Wj0sNipFg2/msKIefqoNg bfdhKOidZ+9x4zVuw7Z0I5pR0DfVW2OIUj5wdmNOGYEmkty70Mgli1/1nilO/+JvEDJC l6xKy8Ao8vpa4BUL21ZH0LFcZnPxCi0AJX42T2UmUIY6DHIQjKNgxaaUCCkexvLshQUG BlFs/gKJ6JIllQHtB6V+wVOBZmPQZumZM8gwT0CDh6kY5BhROsyGAA2XfDGqWevmbuuE ZP9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/ftcT1Si5LLqrGRd7+ykyLXm/kzJfgC1iySzpAzFqo=; b=Oh+L5xXqMu4D4as65reGkTHHbIq5UNrRd0bz5fssmAguimoC4q+S70dyILrVn+aucq +nBlcAJeNaiSuuSJu7iiyMnH+XtdVJRIzkI56I+ZHGvfpMjoCseRGs0gYMbjly7tPWLb WMbZnOzQ/msps7Dkz6reLdDJvjhc1k2gmGBPldGx0oDeGLZZO3ab4+e05ZkZr+pWuFRA s0YQRwikukF9C9S4Zsst3UFjw4mlIxlJE4voAVylug/04LUuJxzyUptnfY6rSy9jN3Zw s1F/evMUrhFIf7eluTGBT6S/Gl3e0Ym8aJyYjNaUObjxxNPpimkoYPcVr84mMtHcpbz6 RBFw== X-Gm-Message-State: AOAM5319YbMcfMOjmzDwIZ3kakTAoWFuHRe1jh1TDMX+jjo4efzPe1YJ SvbjhAhL40VxdtfLfJnZHoA= X-Google-Smtp-Source: ABdhPJwinukf6bX92dmwbAt6lE1DpGM7e8DM4Z7pbtvT8NkWppTtDNGyuWn9wq2aJLCuVhZIjbGpiw== X-Received: by 2002:a17:90a:1912:: with SMTP id 18mr8578402pjg.24.1632330087349; Wed, 22 Sep 2021 10:01:27 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id i27sm3041404pfq.184.2021.09.22.10.01.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:01:26 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , Alex Sverdlin , kernel test robot , Russell King , Florian Fainelli , Steven Rostedt , Ingo Molnar , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT) Subject: [PATCH stable 5.4 v2 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Wed, 22 Sep 2021 10:00:34 -0700 Message-Id: <20210922170034.190023-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170034.190023-1-f.fainelli@gmail.com> References: <20210922170034.190023-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210922_100127_922596_CB1A47F6 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Alex Sverdlin commit 6fa630bf473827aee48cbf0efbbdf6f03134e890 upstream FTRACE_ADDR is only defined when CONFIG_DYNAMIC_FTRACE is defined, the latter is even stronger requirement than CONFIG_FUNCTION_TRACER (which is enough for MCOUNT_ADDR). Link: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/ZUVCQBHDMFVR7CCB7JPESLJEWERZDJ3T/ Fixes: 1f12fb25c5c5d22f ("ARM: 9079/1: ftrace: Add MODULE_PLTS support") Reported-by: kernel test robot Signed-off-by: Alexander Sverdlin Signed-off-by: Russell King Signed-off-by: Florian Fainelli --- arch/arm/kernel/module-plts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index 1285d6770fdf..d1c2d3bd55b6 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -21,7 +21,7 @@ #endif static const u32 fixed_plts[] = { -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_DYNAMIC_FTRACE FTRACE_ADDR, MCOUNT_ADDR, #endif