X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=Makefile;h=843f2f6c28a791df9ddf7bd44128234ab5b20bb7;hb=78a320542e6cdb2800cd736b2d136e4261d34f43;hp=9cc77acfc88166ee9ce2b59bf4101d654188f73b;hpb=1ce41cd849d476f45b2dccaf40b39fe6c4f8d793;p=cascardo%2Flinux.git

diff --git a/Makefile b/Makefile
index 9cc77acfc881..843f2f6c28a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc5
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
@@ -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