1 files changed, 5 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 354026873b13..afbbeda98b4c 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