The patch titled likely-profiling: disable ftrace has been removed from the -mm tree. Its filename was likely-profiling-disable-ftrace.patch This patch was dropped because it was folded into profile-likely-unlikely-macros.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: likely-profiling: disable ftrace From: Daniel Walker <dwalker@xxxxxxxxxx> Remove tracing from likely profiling since it could cause recursion if ftrace uses likely/unlikely macro's internally. Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff -puN lib/Makefile~likely-profiling-disable-ftrace lib/Makefile --- a/lib/Makefile~likely-profiling-disable-ftrace +++ a/lib/Makefile @@ -22,6 +22,9 @@ obj-y += bcd.o div64.o sort.o parser.o h bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ string_helpers.o +# likely profiling can cause recursion in ftrace, so don't trace it. +CFLAGS_REMOVE_likely_prof.o = -pg + ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o += -DDEBUG CFLAGS_kobject_uevent.o += -DDEBUG _ Patches currently in -mm which might be from dwalker@xxxxxxxxxx are linux-next.patch profile-likely-unlikely-macros.patch likely-profiling-disable-ftrace.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html