Thread (5 messages) 5 messages, 1 author, 2021-09-22

[PATCH stable 5.4 v2 4/4] ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE

flat view
STALE1842d

From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2021-09-22 17:01:34
Also in: linux-arm-kernel, lkml
Subsystem: arm port, the rest · Maintainers: Russell King, Linus Torvalds

Revision v2 of 8 in this series.

Revisions (8)
  1. v2
  2. v2 current
  3. v2
  4. v2
  5. v2
  6. v3 [diff vs current]
  7. v3 [diff vs current]
  8. v3 [diff vs current]
From: Alex Sverdlin <redacted>

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 <redacted>
Signed-off-by: Alexander Sverdlin <redacted>
Signed-off-by: Russell King <redacted>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 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 1285d6770fdf..d1c2d3bd55b6 100644
--- a/arch/arm/kernel/module-plts.c
+++ b/arch/arm/kernel/module-plts.c
@@ -21,7 +21,7 @@
 #endif
 
 static const u32 fixed_plts[] = {
-#ifdef CONFIG_FUNCTION_TRACER
+#ifdef CONFIG_DYNAMIC_FTRACE
 	FTRACE_ADDR,
 	MCOUNT_ADDR,
 #endif
-- 
2.25.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help