Message ID | alpine.DEB.1.10.0811200645510.17538@gandalf.stny.rr.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
* Steven Rostedt <rostedt@goodmis.org> wrote: > branch: ppc/ftrace-disable > > > Matt Fleming (1): > ftrace: align __mcount_loc sections > > Steven Rostedt (8): > ftrace: disable dynamic ftrace from PowerPC > powerpc: ftrace, do not latency trace idle > powerpc: ftrace, convert to new dynamic ftrace arch API > powerpc/ppc64: ftrace, mcount record powerpc port > powerpc: ftrace, use probe_kernel API to modify code > powerpc/ppc64: ftrace, handle module trampolines for dyn ftrace > powerpc/ppc32: ftrace, enabled dynamic ftrace > powerpc/ppc32: ftrace, dynamic ftrace to handle modules > > ---- > arch/powerpc/Kconfig | 2 + > arch/powerpc/include/asm/ftrace.h | 14 +- > arch/powerpc/include/asm/module.h | 16 ++- > arch/powerpc/kernel/ftrace.c | 473 +++++++++++++++++++++++++++++++++--- > arch/powerpc/kernel/idle.c | 5 + > arch/powerpc/kernel/module_32.c | 10 + > arch/powerpc/kernel/module_64.c | 13 + > kernel/trace/Kconfig | 1 + > scripts/recordmcount.pl | 20 ++- > 9 files changed, 511 insertions(+), 43 deletions(-) > > There is a dependency on Matt's commit for one of the PPC commits to > apply. I could hack that commit to work without Matt's patch, but > then that just postpones conflicts later on. > > Matt's change is this: > > scripts/recordmcount.pl | 20 ++- looks much better and the (minimal) generic impact is OK i think - as long as Paul Acks the powerpc changes we could freeze that branch (so that Paul can pull it in a few weeks) and base your ftrace-powerpc work on that. ( The branch should still be named something constructive like powerpc-ftrace-v29 or so - not ppc/ftrace-disable - but that's a detail. ) Ingo
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 33dbefd..d9127f4 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -162,6 +162,7 @@ config DYNAMIC_FTRACE depends on FUNCTION_TRACER depends on HAVE_DYNAMIC_FTRACE depends on DEBUG_KERNEL + depends on !PPC default y help This option will modify all the calls to ftrace dynamically