Patch "ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE" has been added to the 5.10-stable tree

[gregkh at linuxfoundation.org]

This is a note to let you know that I've just added the patch titled

    ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable at vger.kernel.org> know about it.


>From foo at baz Thu Sep 23 11:03:54 AM CEST 2021
From: Florian Fainelli <f.fainelli at gmail.com>
Date: Wed, 22 Sep 2021 09:59:58 -0700
Subject: ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE
To: linux-kernel at vger.kernel.org
Cc: stable at vger.kernel.org, Greg Kroah-Hartman <gregkh at linuxfoundation.org>, Sasha Levin <sashal at kernel.org>, Alex Sverdlin <alexander.sverdlin at nokia.com>, kernel test robot <lkp at intel.com>, Russell King <rmk+kernel at armlinux.org.uk>, Florian Fainelli <f.fainelli at gmail.com>, Steven Rostedt <rostedt at goodmis.org>, Ingo Molnar <mingo at redhat.com>, Russell King <linux at armlinux.org.uk>, linux-arm-kernel at lists.infradead.org (moderated list:ARM PORT)
Message-ID: <20210922165958.189843-5-f.fainelli at gmail.com>

From: Alex Sverdlin <alexander.sverdlin at nokia.com>

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 <lkp at intel.com>
Signed-off-by: Alexander Sverdlin <alexander.sverdlin at nokia.com>
Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 arch/arm/kernel/module-plts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm/kernel/module-plts.c
+++ b/arch/arm/kernel/module-plts.c
@@ -22,7 +22,7 @@
 #endif
 
 static const u32 fixed_plts[] = {
-#ifdef CONFIG_FUNCTION_TRACER
+#ifdef CONFIG_DYNAMIC_FTRACE
 	FTRACE_ADDR,
 	MCOUNT_ADDR,
 #endif


Patches currently in stable-queue which might be from f.fainelli at gmail.com are

queue-5.10/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch
queue-5.10/arm-9079-1-ftrace-add-module_plts-support.patch
queue-5.10/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch
queue-5.10/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch
queue-5.10/arm-qualify-enabling-of-swiotlb_init.patch