X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile;h=846dd7607854f3ad1a63eb2af2ebd42faf92e9b9;hb=7e92daaefa68e5ef1e1732e45231e73adbb724e7;hp=ae6928cc59d36d1450b6c9f6e5d87067b662a8db;hpb=cdcd3ac4e945d1fcaef9907839569c2d70b2f3fa;p=~andy%2Flinux

diff --git a/Makefile b/Makefile
index ae6928cc59d..846dd760785 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 3
 PATCHLEVEL = 6
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
-NAME = Saber-toothed Squirrel
+EXTRAVERSION =
+NAME = Terrified Chipmunk
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -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