Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core

[linux-2.6-omap-h63xx.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 9a3ec66a9d841c961e51bfac872462d051098a18..af3be57acbbbde07b69cb37c3d51cf0c00234b99 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -23,6 +23,10 @@ CFLAGS_REMOVE_cgroup-debug.o = -pg
 CFLAGS_REMOVE_sched_clock.o = -pg
 CFLAGS_REMOVE_sched.o = -mno-spe -pg
 endif
+ifdef CONFIG_FUNCTION_RET_TRACER
+CFLAGS_REMOVE_extable.o = -pg # For __kernel_text_address()
+CFLAGS_REMOVE_module.o = -pg # For __module_text_address()
+endif
 
 obj-$(CONFIG_FREEZER) += freezer.o
 obj-$(CONFIG_PROFILING) += profile.o