Merge branch 'linus' into x86/memory-corruption-check
[linux-2.6.git] / arch / x86 / kernel / Makefile
index f63a8034fb82bf7a4b9c46686ddc225c2c1f6f2b..b2077d3fe97721d5427c03754252c53afd4401fc 100644 (file)
@@ -6,11 +6,12 @@ extra-y                := head_$(BITS).o head$(BITS).o head.o init_task.o vmlinu
 
 CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 # Do not profile debug and lowlevel utilities
 CFLAGS_REMOVE_tsc.o = -pg
 CFLAGS_REMOVE_rtc.o = -pg
 CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
+CFLAGS_REMOVE_ftrace.o = -pg
 endif
 
 #