From patchwork Wed Sep 22 17:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12511061 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 388AFC433F5 for ; Wed, 22 Sep 2021 17:12:07 +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 E0DDA60F23 for ; Wed, 22 Sep 2021 17:12:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E0DDA60F23 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=r72RYeHcWYKPzL Yp3DCnb6esWumVUf+ss4+3RjgNlhfyfg02V1iw2s9GodruDNzeBdka5As1aiYdiXYkFkODTFI70A0 mZ7LE/mljEkHNH5oeoaWBygUkDtyu2OUBaCuaEXv/EcaMnIPp6+Oq4nnDhcovN1Sd/u8iX5Qsekax a6ghzkm68x+WXZ2s59N06aq6dc2BcEk8L/pyQSbmDENhDUinBToErAD0tpd4DkqIU/OtjHSumSeL+ 5lFXDwMe911z6Fo2F6B6EaUo8LWX4JJ+RUkc6OUQsG7Squ3RPTGA5SygTrlxRW1+8QIEnclDXvBLa puyQkvXqG16qJ7WtxuBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5jp-009FMZ-Ia; Wed, 22 Sep 2021 17:08:54 +0000 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5dK-009CSY-Ft for linux-arm-kernel@lists.infradead.org; Wed, 22 Sep 2021 17:02:12 +0000 Received: by mail-pg1-x534.google.com with SMTP id u18so3430013pgf.0 for ; Wed, 22 Sep 2021 10:02:09 -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=PYdDrlvyoIx20X25Y4bJbJxIlfKvkkV2DIUtLJAwKCY7zQBCcXRL5HEXrkvocnmpBh IXh6Bn/MKi9v/wva3x/INOxqbv5sYyczLFuuIa5K9NvfAQa+bW4LPSVQsji5d95vUy3i Tv540NV1tsi0y+CkeQyS8QewknFHZNbxO4/Kw78Y63impfsq71lF+D7jgw+W+SPQLoYp JcFnEAx4CGm2TtrkYHUaNXijsP51hafrwFDNvcCxfUIkM3NngxtlbA2pznjB3BVySTUP QsC+rgIeDUJdErayVRpdCkTZ2ySAgvIOtukg2xC6km2zToicoAYQpGLxmzR9jtQHRK9e HzTw== 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=zq7XCg29VkMw6uysSrKAUITaMPSy2zoXXveafCMY/IvOsZB5xCMfoE83zC2hFxwoKS NLDdttHYyVGRfbHFuzspsyXDXoIz6ig5JdHMUT2H6rMSDJnRIOGTD/ZTnQrXN1DTmDdR pPu6+VJREQdRNmqsPVyaPSpe4ux12q0REXFW9X8Re1pYvTx0sTDOKt30ZfyGx6okTtw7 sHZVnFp+rE6qsC5VKtuVlThhFcxqi2Ak/9CcliWgePnd1F9e+464FUe+RYbIefk4YC20 8b8oP/dBVW17W/x93R/NLgto+FRgiTEuozfXF+MedTHD2Qa6DpmBQFy/oQXEJ7rc45q+ EE2w== X-Gm-Message-State: AOAM533hU66261fsmH7LzhEVnt4w2ENfoRjKZeiJeUwVQ1NNp894vzy/ c57UkbB5FTHf9aNHbJ+ds3s= X-Google-Smtp-Source: ABdhPJwBS2j4/8g4/sDYfgfM1Kok8nj2ipUPmAHkdmCWbkxiHzbwnCLa48gtbWUD92Uvx8srt4jO+A== X-Received: by 2002:aa7:98db:0:b0:43e:8544:7e49 with SMTP id e27-20020aa798db000000b0043e85447e49mr119979pfm.58.1632330129272; Wed, 22 Sep 2021 10:02:09 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j7sm3101087pfh.168.2021.09.22.10.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:02:08 -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.19 v2 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Wed, 22 Sep 2021 10:01:28 -0700 Message-Id: <20210922170128.190321-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170128.190321-1-f.fainelli@gmail.com> References: <20210922170128.190321-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_100210_621160_8E70A9F0 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