Re: [PATCH 0/4] ftrace: updates for tip

Ingo Molnar
2008-11-12T21:29:21Z

* Steven Rostedt <rostedt@goodmis.org> wrote:

>
> Ingo,
>
> The following patches are in:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
>
> branch: tip/devel
>
>
> Steven Rostedt (4):
> trace: rename unlikely profiler to branch profiler
> ftrace: rename unlikely iter_ctrl to branch
> ftrace: add tracer called branch
> ftrace: rename trace_unlikely.c file
>
> ----
> arch/x86/kernel/vsyscall_64.c | 2 +-
> arch/x86/vdso/vclock_gettime.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 2 +-
> include/linux/compiler.h | 19 ++-
> kernel/trace/Kconfig | 10 +-
> kernel/trace/Makefile | 7 +-
> kernel/trace/trace.c | 16 +-
> kernel/trace/trace.h | 34 ++--
> kernel/trace/trace_branch.c | 320 +++++++++++++++++++++++++++++++++++++
> kernel/trace/trace_selftest.c | 23 +++
> kernel/trace/trace_unlikely.c | 278 --------------------------------
> 11 files changed, 390 insertions(+), 323 deletions(-)

pulled, thanks Steve!

Ingo