summaryrefslogtreecommitdiff
path: root/lib
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 /lib
parent2f73ccab5628b4f8e8f4b93fea8082dd31a87a10 (diff)
parent2464a609ded094204a3aed24823745ec58e3c879 (diff)
downloadlinux-3.10-bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f.tar.gz
linux-3.10-bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f.tar.bz2
linux-3.10-bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f.zip
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 'lib')
-rw-r--r--lib/Makefile14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 2c62a9c06fb..818c4d45551 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,21 +2,17 @@
# Makefile for some libs needed in the kernel.
#
+ifdef CONFIG_FTRACE
+ORIG_CFLAGS := $(KBUILD_CFLAGS)
+KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
+endif
+
lib-y := ctype.o string.o vsprintf.o cmdline.o \
rbtree.o radix-tree.o dump_stack.o \
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o prio_heap.o ratelimit.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
-CFLAGS_REMOVE_spinlock_debug.o = -pg
-CFLAGS_REMOVE_list_debug.o = -pg
-CFLAGS_REMOVE_debugobjects.o = -pg
-endif
-
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o