From patchwork Mon Sep 27 21: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: 12520785 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 BB526C433F5 for ; Mon, 27 Sep 2021 21:06: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 8513261058 for ; Mon, 27 Sep 2021 21:06:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8513261058 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=Qs5au+TvxezvJA WYTIJhcNd/nUg8QfQk00UEQYhUGkwXHJcg+Qx2S8r6tZY2q2UEDIqvIxPNHvqW0mvqjVv8iIN7OJf //crdgo2A3VpOdsLQy4Q1Kbo3uJOCN/dBPbhO72aCd4Sc2oGWcibRq6jGfdwcWYpjr3b4acrGwriq hANiPFPFQdg1penz9Wa0WyS/sKRIhjyNjRidpSiRwGBHngQ16cnRZMpUEWT9apkhq+tSNgwtDIOBn CfGJM6clgyB28qCIYXzEl8dcXF7POJAIb3omLJs8peoWSckXckrHxYJ29ukUK+jbW3/FYVeoPggqx 8h7sHgxBizjTk4YfXrdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxmq-004ISN-VK; Mon, 27 Sep 2021 21:03:45 +0000 Received: from mail-pg1-f180.google.com ([209.85.215.180]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxm8-004IDo-IN for linux-arm-kernel@lists.infradead.org; Mon, 27 Sep 2021 21:03:02 +0000 Received: by mail-pg1-f180.google.com with SMTP id r2so18954647pgl.10 for ; Mon, 27 Sep 2021 14:02:59 -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=kth8zCT5pd0yh7lFUIW6AiDcPQ2eBSU6lNLQd07LX32o7zuLJJ6unzMLDFo5TtS1KU acpZjS1vbEo65WeKkNTowTViGZl1Zt+Q3ZYlWEY5fPm3jyC8+yg08JRtimawBFkcqIsX HdRxZA4Px5WyQ0UbDXURYxtRcLZPqY6z3VPUsJQ61ILBD1fEzbRgaI0pIXzS3TGR3id+ +LRswv4nzejzTb/v9BXklMieRbVppm3dnxNLIPf4BdEHdpGUUPKYMWz8HpaPl/HIRHnM YLxvnMQkgh3tJ/sXxZJiNITDEPp8nT6jKHeVq4gfUTD+OfnnMz1815zy6Xj187JEk0Fq 84Gg== 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=60aQD0AgZO5NfY6O0Og25dDs67s4Q2rd60F7+D+16XCfFlPFJkEW6+bUBQMMqL/3k8 ejpbAdYupNASABlgoJyuCPEEdu3TSM9fg8zxH9Qx9TjZFZzimZoYQSNEQ2cpesohX4/0 f80FIuNK/03Z7folTyn3ZcqFpD6IZ05Ylk8QUsw262JU5cbY9jr/FMFq3siq9nlyS1lH gm1pwQ0/wcdOe6zVt6j8j6D9hRuaF5f1295nxz+EGG+6ySoRUOtF32wzccEzjcKdwXL+ IH5egFDWCf6sPzYxo6VQCEFwwc/zfMPjUT8osNlWuqGll+96EH2ZLdUYgbx+u6qu1jpt Ok2Q== X-Gm-Message-State: AOAM531D+YGsanNreyEb1tsw+TpYnG4UKt+X1gOEs67QdZtcaLsdWAUy XY8l7FTd2shGgOcmtGeyu7E= X-Google-Smtp-Source: ABdhPJxjOG9ZIU3qVbiLgYc0uxevcnsAj/QvebUFqDe1UJZoQX1zQs6sei/5wDFjC8H0FP0wvbXd5g== X-Received: by 2002:a05:6a00:bcf:b0:44b:8d5c:e2dc with SMTP id x15-20020a056a000bcf00b0044b8d5ce2dcmr1949463pfu.66.1632776579053; Mon, 27 Sep 2021 14:02:59 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id y3sm310537pjg.7.2021.09.27.14.02.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 14:02:58 -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 v3 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Mon, 27 Sep 2021 14:02:46 -0700 Message-Id: <20210927210246.3216892-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927210246.3216892-1-f.fainelli@gmail.com> References: <20210927210246.3216892-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_140300_677305_E310857C 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