From patchwork Wed Sep 22 17:02:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12511091 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 42709C433F5 for ; Wed, 22 Sep 2021 17:23:15 +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 0A2C1610D1 for ; Wed, 22 Sep 2021 17:23:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0A2C1610D1 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=7h4Vqzh5BR1KqIuaHMIiv2uOaiFPeAx08UGk4dTQYhc=; b=3NscRyUypA5fwU tZVbYVTn1ufsJaxsZMYZ+8YCBOzBI8L4ozm7zfQJOUixrRB+vYjSG+vIBwah1/LBklZA32gnB070v I/djkFlXwoXqnwcg2yc2nYJigLX9OhibVnsWm8qYAMwZEcc2Mk54bK0v/rKT+4qcyw/aTZ562/rfD Gv2VV9Eb8k2emPDvqteEYK6cqAQnCjGIKBsryx13ZT+FYJNXkFQbrWEOTSt65HXbRGkdFZ2NZ9366 pRWE48/MRVbT4ai6MHas74YiCUV2df9PUuwMewZHTdv18riYvRHfwAdW842jU9zSOvPAZrca6f97j +DzN4Ad8WN0GUFZt1iOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5v2-009JN5-4O; Wed, 22 Sep 2021 17:20:29 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5e6-009Cpn-4j for linux-arm-kernel@lists.infradead.org; Wed, 22 Sep 2021 17:03:00 +0000 Received: by mail-pj1-x1036.google.com with SMTP id mv7-20020a17090b198700b0019c843e7233so2794470pjb.4 for ; Wed, 22 Sep 2021 10:02:57 -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=ETleUGqj8okouLW+8qnjHS0760cK4CL53iB0k0eC4GY=; b=Dprf5xWzJ9KPg3xS9vOEKpHkriRgiOvViVnv+zMjKPVwOOHn/yR8y46EtYYp7I9I5M Oq1jwvqUycvK3kiLKpf7irjLxhFTMv6SGPTemN267XAbndpFW26qcceDD96wh5SDh6+U ulqQaZa8Qk70xIKqjwqE1T1szjjLlpocojYL80kArIwdq5/FztXBcgue95ol7l9EMeNv t4vlkA9t584fPr40FAPsET5xSvH5drMkr3wmBjesZCsH3GWihYW+AD93HAxBAZTmqI/7 zENWeqZReuG/Qcdy/QWhTh4hbz7RzNrIKdictFBn+Fmkk+FnAP9iF31VK0pbt4+Zyiwk efHQ== 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=ETleUGqj8okouLW+8qnjHS0760cK4CL53iB0k0eC4GY=; b=dtBTx3i2267Ucg+/jJMsG8E1nqMuf3L6sypAnFrUCoct43t626t4SqX52r2IMGnet/ G2mJGBiVGE/t8X9GkqmXm7OWoBdkhGvOozEDC26y6u/A7UGMxBaiPrk+++0JpZzL1bGz Nqs/G5AZL00oC4BARdsMYk2wjWoUYq4eMNi1TrFwV1dNvTzIOy79nI5e8GR75jdWHjiF 2RZt5fa9IVRqqXI+fNNDQl3nEv9HIRl0/b9wF0Xr3ViHmHLQmoU5iqQE5b/0gPfszrz4 DHd71zJTCA/tKfQ+MHQY11kmcSbmwuchDS2Fonwmbz9iOpLs2OWzNhy3DtYA5znkBjsl anWw== X-Gm-Message-State: AOAM532KBwkGlIZS6BKedoWPG1adaOME3rpbWAIdYcszVM4NBld8xi+W 6CN+f5xzQRLy9H4kNSflSM+PoXBGbyU= X-Google-Smtp-Source: ABdhPJxIRGttokXOiwMnk+mLwRFxpSFSzxwc6uPdqvzruvSa4OJ01GDEtk166KRDrXZ4Yhp7boYjbg== X-Received: by 2002:a17:90a:de0b:: with SMTP id m11mr78704pjv.90.1632330176614; Wed, 22 Sep 2021 10:02:56 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x128sm3061885pfd.203.2021.09.22.10.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:02:56 -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 4.9 v2 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Wed, 22 Sep 2021 10:02:46 -0700 Message-Id: <20210922170246.190499-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170246.190499-1-f.fainelli@gmail.com> References: <20210922170246.190499-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_100258_326317_48373DDA 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 6804a145be11..ed0e09cc735f 100644 --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -24,7 +24,7 @@ #endif static const u32 fixed_plts[] = { -#ifdef CONFIG_FUNCTION_TRACER +#ifdef CONFIG_DYNAMIC_FTRACE FTRACE_ADDR, MCOUNT_ADDR, #endif