Merge branch 'tracing/ftrace' into tracing/urgent

This commit is contained in:
Ingo Molnar
2008-10-22 09:08:14 +02:00
40 changed files with 113 additions and 68 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# Makefile for some libs needed in the kernel.
#
ifdef CONFIG_FTRACE
ifdef CONFIG_FUNCTION_TRACER
ORIG_CFLAGS := $(KBUILD_CFLAGS)
KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
endif