Merge branch 'tip/tracing/core4' of...
Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Showing
- Documentation/trace/ftrace-design.txt 233 additions, 0 deletionsDocumentation/trace/ftrace-design.txt
- Documentation/trace/ftrace.txt 6 additions, 0 deletionsDocumentation/trace/ftrace.txt
- include/linux/kprobes.h 2 additions, 2 deletionsinclude/linux/kprobes.h
- include/trace/ftrace.h 4 additions, 4 deletionsinclude/trace/ftrace.h
- kernel/trace/Kconfig 25 additions, 3 deletionskernel/trace/Kconfig
- kernel/trace/ftrace.c 2 additions, 2 deletionskernel/trace/ftrace.c
- kernel/trace/trace_clock.c 14 additions, 10 deletionskernel/trace/trace_clock.c
- kernel/trace/trace_entries.h 9 additions, 18 deletionskernel/trace/trace_entries.h
- kernel/trace/trace_events.c 13 additions, 1 deletionkernel/trace/trace_events.c
- kernel/trace/trace_export.c 41 additions, 30 deletionskernel/trace/trace_export.c
Loading
Please register or sign in to comment