From 3fb08a7b802ef87ac85bfe2a193c3c6cce7fbcb0 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 14 May 2008 21:30:30 -0400
Subject: [PATCH] --- yaml --- r: 100550 b: refs/heads/master c:
 6ec562328fda585be2d7f472cfac99d3b44d362a h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/Makefile | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 95ea69f35ea4..d801a7035670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 656ee82cc855027b2e994ad218519b09fa652cc1
+refs/heads/master: 6ec562328fda585be2d7f472cfac99d3b44d362a
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index d2f80ea4cd9a..ca2433e84873 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -11,12 +11,16 @@ obj-y     = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
 	    hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 	    notifier.o ksysfs.o pm_qos_params.o sched_clock.o
 
+CFLAGS_REMOVE_sched.o = -pg -mno-spe
+
 ifdef CONFIG_FTRACE
-# Do not profile debug utilities
-ORIG_CFLAGS := $(KBUILD_CFLAGS)
-KBUILD_CFLAGS = $(if $(filter-out lockdep% %debug,$(basename $(notdir $@))), \
-	$(ORIG_CFLAGS), \
-	$(subst -pg,,$(ORIG_CFLAGS)))
+# Do not trace debug files and internal ftrace files
+CFLAGS_REMOVE_lockdep.o = -pg
+CFLAGS_REMOVE_lockdep_proc.o = -pg
+CFLAGS_REMOVE_mutex-debug.o = -pg
+CFLAGS_REMOVE_rtmutex-debug.o = -pg
+CFLAGS_REMOVE_cgroup-debug.o = -pg
+CFLAGS_REMOVE_sched_clock.o = -pg
 endif
 
 obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o