summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-10-28 14:26:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-11-21 16:25:01 +0100
commit82112379b73c937576f40c99b4d93162343af6f9 (patch)
tree52efb9d4ec5adc902753c57a4314ecabd8ba5a49 /arch/arm/kernel/Makefile
parentARM: add machine name to stack dump output (diff)
downloadlinux-82112379b73c937576f40c99b4d93162343af6f9.tar.xz
linux-82112379b73c937576f40c99b4d93162343af6f9.zip
ARM: move ftrace assembly code to separate file
The ftrace assembly code doesn't need to live in entry-common.S and be surrounded with #ifdef CONFIG_FUNCTION_TRACER. Instead, move it to its own file and conditionally assemble it. Tested-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/Makefile')
-rw-r--r--arch/arm/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 38ddd9f83d0e..738ebe5a91e6 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -47,6 +47,7 @@ endif
obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o
obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o
obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o
+obj-$(CONFIG_FUNCTION_TRACER) += entry-ftrace.o
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o
obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o