From patchwork Mon Sep 27 21:03:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12520819 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 6692CC433F5 for ; Mon, 27 Sep 2021 21:14:37 +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 304A361052 for ; Mon, 27 Sep 2021 21:14:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 304A361052 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=AN8TEBWia/09Tg 05Mjz4pYIry2ZEEPq46EYO4aOmdpDnHFSRn1lKvGrRrPzq6+Vw5NhYlejQZ9zpbxPl0XH9JJyZpvG xmtCPbvvf+6AWY4jJiqtCtcWPJlcvqji+KWaiuRpLi2i3w3jcM3egFb6UiWRFAmO7J6KO/p3Tt6JK sfcQSsdjeThz7rxEYsy6wT8fnUeUH2iE//XS+4Ctp5wt3gbHwmkuBAvWnAtuNwDVm/LYawNmW0Kwa yhqhny/EdRmNOGsrQFLYfMnkaWld+fU7CBUW/2fGCtn96fjoPQ52OSxh278RfKXmaKoFjuRISsi1B VLwLzrYVxzVSJzjj/YzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxvB-004MIt-8o; Mon, 27 Sep 2021 21:12:22 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUxmY-004IMR-A8 for linux-arm-kernel@lists.infradead.org; Mon, 27 Sep 2021 21:03:28 +0000 Received: by mail-pg1-x52e.google.com with SMTP id 133so735552pgb.1 for ; Mon, 27 Sep 2021 14:03:25 -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=XpvWzPwGwWdBcSVU8HoIDPkp3FhA5QkwC4vjsoD8hwgEpWq03uUohI1GhY0ijA+BWi LPUJvtFWTf884MGGDNOcrZQot5ucPa3edlnFPwmq//le0l3/ad+m0x5A5IrLZ4/j4qLb BaXYWN7ef39y+9XoETfbySA5LrXQtZfUL3WuJ+IhE8sG6PKC0VueweEFps0NvDsHvFnp fp/NAYdsUiKXK/mf0oHLvp4gAw+IvkLFF5vG8seBuIkoWthalkfK86/zqjpqfAQS2XCp 4JRnNnX+zrpFui3+eu2dDg8O9E4RhQZ9QLhdZxIrhr+j1UiaXV23f8qGA0FYWljZydQU YFpQ== 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=VKEFf8nJPRBMKkWfGi7wINbJK+hJbmXjm7+Qv0RSdBl8PP3ery+0wRzwheq3tFh4Yx AfRg4on8R/vp1ZomRNLq+7fNmqQi/dEbShIhuMSaMogMdM84X3FPbvDREymbp2FDnyS9 WNkgtdlAut4WpZw3Z5TN9OKTckMP7MyoCAIId7uh8koQuYkO8awFR1fUEFxLJ+Jef30e kVib/1QepP0QTVLpNq+KE2E6r6veH/1VoNm9TwpGBpySYVBhT1OwK0JuTIycmzaL0f+i S4qaRHW35vrSBfQTk8uxBoAiF0zXqwgzdhhiZzEMQ/nu7WZdfRjIxizfl8flFbp4u1p9 nbjw== X-Gm-Message-State: AOAM533rA5zCuawGiI1HUfyVK2tR8d3gAfWgw7sRKbpXWXp9pmOn7+Eq J//70D+yd5Xpv4ddTj72LI0= X-Google-Smtp-Source: ABdhPJy42ZtwDoPBrd/Nrq24HJHXQ/y99KsiQLcu1b0KuYnzSCLW9YKT7DSPdGpIQcYDR0OkU8jAUQ== X-Received: by 2002:aa7:8426:0:b0:438:3550:f190 with SMTP id q6-20020aa78426000000b004383550f190mr1934647pfn.19.1632776605214; Mon, 27 Sep 2021 14:03:25 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id e12sm16444086pgv.82.2021.09.27.14.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 14:03:24 -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 v3 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE Date: Mon, 27 Sep 2021 14:03:16 -0700 Message-Id: <20210927210316.3217044-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927210316.3217044-1-f.fainelli@gmail.com> References: <20210927210316.3217044-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_140326_394422_6F75D81E 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