diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /kernel/Makefile | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
download | blackbird-op-linux-debfcaf93ed500a051489db6646d71f29fe86a68.tar.gz blackbird-op-linux-debfcaf93ed500a051489db6646d71f29fe86a68.zip |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 305f11dbef21..9a3ec66a9d84 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -13,7 +13,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ CFLAGS_REMOVE_sched.o = -mno-spe -ifdef CONFIG_FTRACE +ifdef CONFIG_FUNCTION_TRACER # Do not trace debug files and internal ftrace files CFLAGS_REMOVE_lockdep.o = -pg CFLAGS_REMOVE_lockdep_proc.o = -pg @@ -88,7 +88,7 @@ obj-$(CONFIG_MARKERS) += marker.o obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o -obj-$(CONFIG_FTRACE) += trace/ +obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o |