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
This commit is contained in:
@@ -8,8 +8,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
|
|||||||
|
|
||||||
ifdef CONFIG_FTRACE
|
ifdef CONFIG_FTRACE
|
||||||
# Do not profile debug utilities
|
# Do not profile debug utilities
|
||||||
CFLAGS_REMOVE_tsc_64.o = -pg
|
CFLAGS_REMOVE_tsc.o = -pg
|
||||||
CFLAGS_REMOVE_tsc_32.o = -pg
|
|
||||||
CFLAGS_REMOVE_rtc.o = -pg
|
CFLAGS_REMOVE_rtc.o = -pg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -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 \
|
hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
|
||||||
notifier.o ksysfs.o pm_qos_params.o sched_clock.o
|
notifier.o ksysfs.o pm_qos_params.o sched_clock.o
|
||||||
|
|
||||||
CFLAGS_REMOVE_sched.o = -mno-spe
|
|
||||||
|
|
||||||
ifdef CONFIG_FTRACE
|
ifdef CONFIG_FTRACE
|
||||||
# Do not trace debug files and internal ftrace files
|
# Do not trace debug files and internal ftrace files
|
||||||
CFLAGS_REMOVE_lockdep.o = -pg
|
CFLAGS_REMOVE_lockdep.o = -pg
|
||||||
@@ -21,6 +19,7 @@ CFLAGS_REMOVE_mutex-debug.o = -pg
|
|||||||
CFLAGS_REMOVE_rtmutex-debug.o = -pg
|
CFLAGS_REMOVE_rtmutex-debug.o = -pg
|
||||||
CFLAGS_REMOVE_cgroup-debug.o = -pg
|
CFLAGS_REMOVE_cgroup-debug.o = -pg
|
||||||
CFLAGS_REMOVE_sched_clock.o = -pg
|
CFLAGS_REMOVE_sched_clock.o = -pg
|
||||||
|
CFLAGS_REMOVE_sched.o = -mno-spe -pg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
|
obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
|
||||||
|
14
lib/Makefile
14
lib/Makefile
@@ -2,21 +2,17 @@
|
|||||||
# Makefile for some libs needed in the kernel.
|
# 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 \
|
lib-y := ctype.o string.o vsprintf.o cmdline.o \
|
||||||
rbtree.o radix-tree.o dump_stack.o \
|
rbtree.o radix-tree.o dump_stack.o \
|
||||||
idr.o int_sqrt.o extable.o prio_tree.o \
|
idr.o int_sqrt.o extable.o prio_tree.o \
|
||||||
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
|
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
|
||||||
proportions.o prio_heap.o ratelimit.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_MMU) += ioremap.o
|
||||||
lib-$(CONFIG_SMP) += cpumask.o
|
lib-$(CONFIG_SMP) += cpumask.o
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user