From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 15 May 2008 01:30:31 +0000 (-0400)
Subject: ftrace: use the new kbuild CFLAGS_REMOVE for lib directory
X-Git-Tag: v2.6.27-rc1~1102^2^2~1^2~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=654e4787689faffdd2137fe91f59fd3ef3363ad2;p=linux-2.6-omap-h63xx.git

ftrace: use the new kbuild CFLAGS_REMOVE for lib directory

This patch removes the Makefile turd and uses the nice CFLAGS_REMOVE macro
in the lib directory.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/lib/Makefile b/lib/Makefile
index d97ad1100b6..4b836a53c08 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -10,11 +10,11 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
 
 ifdef CONFIG_FTRACE
 # Do not profile string.o, since it may be used in early boot or vdso
+CFLAGS_REMOVE_string.o = -pg
 # Also do not profile any debug utilities
-ORIG_CFLAGS := $(KBUILD_CFLAGS)
-KBUILD_CFLAGS = $(if $(filter-out %debug debug% string%,$(basename $(notdir $@))), \
-	$(ORIG_CFLAGS), \
-	$(subst -pg,,$(ORIG_CFLAGS)))
+CFLAGS_REMOVE_spinlock_debug.o = -pg
+CFLAGS_REMOVE_list_debug.o = -pg
+CFLAGS_REMOVE_debugobjects.o = -pg
 endif
 
 lib-$(CONFIG_MMU) += ioremap.o