From patchwork Mon Sep 27 21:02:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12520807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 931D3C433EF for ; Mon, 27 Sep 2021 21:09:27 +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 5C53460EFD for ; Mon, 27 Sep 2021 21:09:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5C53460EFD 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=gNu3yVN7ChEsek K0H4fILYZ7pkGp5JNOcIuIeV6/EoTVS7B1l/g2O44ieYh/UQW0kRGCGaFeg6kOHX8V4scIRBy6owA LICOX4w/kAy/sPeNQUXDH6ku5mC3kR7wiBgwPUe9K+CemHO8u729f9euJiPHNo8EIHi3K6tYTnmJI 5DEAXoCaBDojgg9S0TpXOQl/J+g8p6G9SLYy4S7WMdf6mrJWkAI707+hKBGESSUfWaMU3F5ivli59 5oFuGxswv3IWQ2ozpdH8kO+X/nVL9+je0eHLNCxXRRBnMSYWGIC94iRZggztH/2289AkY8fz4K7EF xyjigBBYI47Ec89ymjFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxqO-004KE1-6a; Mon, 27 Sep 2021 21:07:25 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxmO-004IJW-MD for linux-arm-kernel@lists.infradead.org; Mon, 27 Sep 2021 21:03:18 +0000 Received: by mail-pg1-x52f.google.com with SMTP id y186so7603230pgd.0 for ; Mon, 27 Sep 2021 14:03:16 -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=BhgIhf3pF0/fF3D7M8SD1R2rSyzbVDt92gPENJBRZwq/gewYzqA44On2xUvcprSFYN XlVrTpYAArnwmAmi5q1FZpLffouCAr0wYVD7hhEprcOiQEgIitS7DWcahrZT5Q2JX16Z 0TCweoONmXgJlN/l0rx1KWuLBvAHKcdjRj1WXKo2BSQr4d8hIg91cdDC5rMzRaAdy7O7 tNczDAAC2BsVD2OrgEOwWfyUCntqUbYRpeg+fKc+PaVAe8hEMsX1YGBJRtMEvPO4m5UG +cRDVgWMlxWtRQB58F+MulTTSkWxN0ancNDlIAvPa7ySpc/BW0rgZjLOh3hJfHuY0zD8 eFmw== 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=YqeO9JLEEUmk4nW0WyLVHJ0n6i4dV2wfX91DPOYgRSnq8lVsjGh6dYZ3lBHj9nBu6P d5lEvqVcR9rVZG0+i2zgHF2Vp98ZJpfSqYjIO/4McuLrubXLAkzLfb4ly+jyj86ZJxLh vNPH7jrQxCTcli5TmMGFaoLd2iCIF9GeGbzG8BLeSKP1g4qJxfwQJSyoj+rg6mNexZIZ zu3KUZnPeCpfeCz9pRLtGFBkIcbOfYNhv3/eaOT7MkSFSv+4dHZv7di98MChEHzRtnoc sAsEKhl6DfveUkk8hgZUvOUU+4Q1VF25xgEj4jQRDwXUtWpF8gh74V0pux0hxb1TQtrU HGrg== X-Gm-Message-State: AOAM532CvAOZuEnkWgpAG377dqIyhdhVqN541oxzDLIpuSTWdNJKwNa+ b3vdQcHY7dvBeH+ZzLTgMVo= X-Google-Smtp-Source: ABdhPJxhcTA/oRZRlsyJvsgZ532edZsaP37vj4aJ1ceyJqTiY60SD7F5OAJw7bmpEg869ihGkD8A1w== X-Received: by 2002:aa7:82d0:0:b0:413:5e93:2f7a with SMTP id f16-20020aa782d0000000b004135e932f7amr1938782pfn.16.1632776595564; Mon, 27 Sep 2021 14:03:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o16sm19227652pgv.29.2021.09.27.14.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 14:03:14 -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.14 v3 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Mon, 27 Sep 2021 14:02:59 -0700 Message-Id: <20210927210259.3216965-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927210259.3216965-1-f.fainelli@gmail.com> References: <20210927210259.3216965-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-20210927_140316_746746_7AEDF284 X-CRM114-Status: GOOD ( 14.19 ) 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