From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 15 May 2008 01:30:32 +0000 (-0400)
Subject: ftrace: use the new kbuild CFLAGS_REMOVE for x86/kernel directory
X-Git-Tag: v2.6.27-rc1~1102^2^2~1^2~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7fa09f24b477ad41b821713eba757b3aa7a2864a;p=linux-2.6-block.git

ftrace: use the new kbuild CFLAGS_REMOVE for x86/kernel directory

This patch removes the Makefile turd and uses the nice CFLAGS_REMOVE macro
in the x86/kernel 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/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index e142091524b0..739d49acd2f1 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -6,6 +6,13 @@ extra-y                := head_$(BITS).o head$(BITS).o init_task.o vmlinux.lds
 
 CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
 
+ifdef CONFIG_FTRACE
+# Do not profile debug utilities
+CFLAGS_REMOVE_tsc_64.o = -pg
+CFLAGS_REMOVE_tsc_32.o = -pg
+CFLAGS_REMOVE_rtc.o = -pg
+endif
+
 #
 # vsyscalls (which work on the user stack) should have
 # no stack-protector checks: