X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile;h=846dd7607854f3ad1a63eb2af2ebd42faf92e9b9;hb=15385dfe7e0fa6866b204dd0d14aec2cc48fc0a7;hp=bb9fff26f078063c395fe8f86488349614c84261;hpb=e151960a23cc99e310f90adad7ee592821a77434;p=~andy%2Flinux

diff --git a/Makefile b/Makefile
index bb9fff26f07..846dd760785 100644
--- a/Makefile
+++ b/Makefile
@@ -609,7 +609,11 @@ KBUILD_CFLAGS 	+= $(call cc-option, -femit-struct-debug-baseonly)
 endif
 
 ifdef CONFIG_FUNCTION_TRACER
-KBUILD_CFLAGS	+= -pg
+ifdef CONFIG_HAVE_FENTRY
+CC_USING_FENTRY	:= $(call cc-option, -mfentry -DCC_USING_FENTRY)
+endif
+KBUILD_CFLAGS	+= -pg $(CC_USING_FENTRY)
+KBUILD_AFLAGS	+= $(CC_USING_FENTRY)
 ifdef CONFIG_DYNAMIC_FTRACE
 	ifdef CONFIG_HAVE_C_RECORDMCOUNT
 		BUILD_C_RECORDMCOUNT := y