On Sat, Nov 14, 2009 at 02:30:31PM +0800, Wu Zhangjin wrote: Time to talk about how to get the whole thing merged. I'm reasonably happy with the arch part of the patchset. There are two remaining issues in the arch part - cache flushing will not work as is on a SMP system and the whole code patching is going to fail if the kernel text is replicated with CONFIG_REPLICATE_KTEXT which is an IP27-only option. I suggest we should go ahready and just disallow dynamic ftrace on on these problematic configurations for now and deal with them later, so something like select HAVE_DYNAMIC_FTRACE if !SMP && !REPLICATE_KTEXT This leaves the non-arch bits to merge; patches which touch code outside of arch/mips are: [PATCH v8 01/16] tracing: convert trace_clock_local() as weak function [PATCH v8 06/16] tracing: add an endian argument to [PATCH v8 07/16] tracing: add dynamic function tracer support for MIPS [PATCH v8 09/16] tracing: define a new __time_notrace annotation flag [PATCH v8 10/16] tracing: not trace the timecounter_read* in Ralf