Skip to content

Commit

Permalink
ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FT…
Browse files Browse the repository at this point in the history
…RACE

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: 1f12fb2 ("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>
  • Loading branch information
asverdlin authored and Russell King (Oracle) committed Jul 5, 2021
1 parent e17362d commit 6fa630b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/kernel/module-plts.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#endif

static const u32 fixed_plts[] = {
#ifdef CONFIG_FUNCTION_TRACER
#ifdef CONFIG_DYNAMIC_FTRACE
FTRACE_ADDR,
MCOUNT_ADDR,
#endif
Expand Down

0 comments on commit 6fa630b

Please sign in to comment.