OSDN Git Service

ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE
authorAlex Sverdlin <alexander.sverdlin@nokia.com>
Thu, 1 Jul 2021 15:20:28 +0000 (16:20 +0100)
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Mon, 5 Jul 2021 10:52:26 +0000 (11:52 +0100)
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@intel.com>
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
arch/arm/kernel/module-plts.c

index a0524ad..1fc309b 100644 (file)
@@ -22,7 +22,7 @@
 #endif
 
 static const u32 fixed_plts[] = {
-#ifdef CONFIG_FUNCTION_TRACER
+#ifdef CONFIG_DYNAMIC_FTRACE
        FTRACE_ADDR,
        MCOUNT_ADDR,
 #endif