2021-06-08 23:37:22

by Alexander Sverdlin

[permalink] [raw]
Subject: [PATCH] ARM: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE

From: Alexander Sverdlin <[email protected]>

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).

Fixes: 1f12fb25c5c5d22f ("ARM: 9079/1: ftrace: Add MODULE_PLTS support")
Reported-by: kernel test robot <[email protected]>
Link: https://lists.01.org/hyperkitty/list/[email protected]/thread/ZUVCQBHDMFVR7CCB7JPESLJEWERZDJ3T/
Signed-off-by: Alexander Sverdlin <[email protected]>
---
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 a0524ad..1fc309b 100644
--- 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
--
2.10.2