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 4.19-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-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Thu Sep 23 12:32:45 PM CEST 2021 From: Florian Fainelli <f.fainelli@xxxxxxxxx> Date: Wed, 22 Sep 2021 10:01:28 -0700 Subject: ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE To: linux-kernel@xxxxxxxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sasha Levin <sashal@xxxxxxxxxx>, Alex Sverdlin <alexander.sverdlin@xxxxxxxxx>, kernel test robot <lkp@xxxxxxxxx>, Russell King <rmk+kernel@xxxxxxxxxxxxxxx>, Florian Fainelli <f.fainelli@xxxxxxxxx>, Steven Rostedt <rostedt@xxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>, Russell King <linux@xxxxxxxxxxxxxxx>, linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated list:ARM PORT) Message-ID: <20210922170128.190321-5-f.fainelli@xxxxxxxxx> From: Alex Sverdlin <alexander.sverdlin@xxxxxxxxx> 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@xxxxxxxxxxxx/thread/ZUVCQBHDMFVR7CCB7JPESLJEWERZDJ3T/ Fixes: 1f12fb25c5c5d22f ("ARM: 9079/1: ftrace: Add MODULE_PLTS support") Reported-by: kernel test robot <lkp@xxxxxxxxx> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@xxxxxxxxx> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxx> Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 @@ -24,7 +24,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@xxxxxxxxx are queue-4.19/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch queue-4.19/arm-9079-1-ftrace-add-module_plts-support.patch queue-4.19/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch queue-4.19/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch