summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 10:37:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-17 10:37:10 -0700
commitbdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (patch)
treedd9705b6facd753cc0e239016c0f7618c74cba19 /kernel
parent2f73ccab5628b4f8e8f4b93fea8082dd31a87a10 (diff)
parent2464a609ded094204a3aed24823745ec58e3c879 (diff)
downloadop-kernel-dev-bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f.zip
op-kernel-dev-bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f.tar.gz
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: do not trace library functions ftrace: do not trace scheduler functions ftrace: fix lockup with MAXSMP ftrace: fix merge buglet
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 0a7ed83..985ddb7 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -11,8 +11,6 @@ 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 = -mno-spe
-
ifdef CONFIG_FTRACE
# Do not trace debug files and internal ftrace files
CFLAGS_REMOVE_lockdep.o = -pg
@@ -21,6 +19,7 @@ CFLAGS_REMOVE_mutex-debug.o = -pg
CFLAGS_REMOVE_rtmutex-debug.o = -pg
CFLAGS_REMOVE_cgroup-debug.o = -pg
CFLAGS_REMOVE_sched_clock.o = -pg
+CFLAGS_REMOVE_sched.o = -mno-spe -pg
endif
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
OpenPOWER on IntegriCloud