tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds bdec6cac 2f73ccab

+7 -13
unified split
+1 -2
arch/x86/kernel/Makefile
··· 8 8 9 9 ifdef CONFIG_FTRACE 10 10 # Do not profile debug utilities 11 - CFLAGS_REMOVE_tsc_64.o = -pg 12 - CFLAGS_REMOVE_tsc_32.o = -pg 11 + CFLAGS_REMOVE_tsc.o = -pg 13 12 CFLAGS_REMOVE_rtc.o = -pg 14 13 endif 15 14
+1 -2
kernel/Makefile
··· 11 11 hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ 12 12 notifier.o ksysfs.o pm_qos_params.o sched_clock.o 13 13 14 - CFLAGS_REMOVE_sched.o = -mno-spe 15 - 16 14 ifdef CONFIG_FTRACE 17 15 # Do not trace debug files and internal ftrace files 18 16 CFLAGS_REMOVE_lockdep.o = -pg ··· 19 21 CFLAGS_REMOVE_rtmutex-debug.o = -pg 20 22 CFLAGS_REMOVE_cgroup-debug.o = -pg 21 23 CFLAGS_REMOVE_sched_clock.o = -pg 24 + CFLAGS_REMOVE_sched.o = -mno-spe -pg 22 25 endif 23 26 24 27 obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
+5 -9
lib/Makefile
··· 2 2 # Makefile for some libs needed in the kernel. 3 3 # 4 4 5 + ifdef CONFIG_FTRACE 6 + ORIG_CFLAGS := $(KBUILD_CFLAGS) 7 + KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) 8 + endif 9 + 5 10 lib-y := ctype.o string.o vsprintf.o cmdline.o \ 6 11 rbtree.o radix-tree.o dump_stack.o \ 7 12 idr.o int_sqrt.o extable.o prio_tree.o \ 8 13 sha1.o irq_regs.o reciprocal_div.o argv_split.o \ 9 14 proportions.o prio_heap.o ratelimit.o 10 - 11 - ifdef CONFIG_FTRACE 12 - # Do not profile string.o, since it may be used in early boot or vdso 13 - CFLAGS_REMOVE_string.o = -pg 14 - # Also do not profile any debug utilities 15 - CFLAGS_REMOVE_spinlock_debug.o = -pg 16 - CFLAGS_REMOVE_list_debug.o = -pg 17 - CFLAGS_REMOVE_debugobjects.o = -pg 18 - endif 19 15 20 16 lib-$(CONFIG_MMU) += ioremap.o 21 17 lib-$(CONFIG_SMP) += cpumask.o