The patch titled likely-profiling: disable ftrace has been added to the -mm tree. Its filename is likely-profiling-disable-ftrace.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this 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 | 2 ++ 1 file changed, 2 insertions(+) diff -puN lib/Makefile~likely-profiling-disable-ftrace lib/Makefile --- a/lib/Makefile~likely-profiling-disable-ftrace +++ a/lib/Makefile @@ -15,6 +15,8 @@ CFLAGS_REMOVE_string.o = -pg CFLAGS_REMOVE_spinlock_debug.o = -pg CFLAGS_REMOVE_list_debug.o = -pg CFLAGS_REMOVE_debugobjects.o = -pg +# likely profiling can cause recursion in ftrace, so don't trace it. +CFLAGS_REMOVE_likely_prof.o = -pg endif lib-$(CONFIG_MMU) += ioremap.o _ Patches currently in -mm which might be from dwalker@xxxxxxxxxx are macintosh-therm_windtunnel-semaphore-to-mutex.patch macintosh-media-bay-semaphore-to-mutex.patch profile-likely-unlikely-macros.patch likely_prof-changed-to-use-proc_create.patch likeliness-accounting-change-and-cleanup.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