Merge branch 'linus' into tracing/ftrace

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

diff --git a/Makefile b/Makefile
index 6aff5f47c21d1f13c633de4f14835688c49244db..ff2c681fb5dd6bc61efe62490d4e2b0702ddd5f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -528,6 +528,10 @@ KBUILD_CFLAGS      += -g
 KBUILD_AFLAGS  += -gdwarf-2
 endif
 
+ifdef CONFIG_FTRACE
+KBUILD_CFLAGS  += -pg
+endif
+
 # We trigger additional mismatches with less inlining
 ifdef CONFIG_DEBUG_SECTION_MISMATCH
 KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)