Merge branch 'tracing-fixes-for-linus' of...
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: Fix the output of profile ring-buffer: Make it generally available ftrace: Remove duplicate newline tracing: Fix trace_buf_size boot option ftrace: Fix t_hash_start() ftrace: Don't manipulate @pos in t_start() ftrace: Don't increment @pos in g_start() tracing: Reset iterator in t_start() trace_stat: Don't increment @pos in seq start() tracing_bprintk: Don't increment @pos in t_start() tracing/events: Don't increment @pos in s_start()
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 2 additions, 1 deletionDocumentation/kernel-parameters.txt
- kernel/Makefile 1 addition, 0 deletionskernel/Makefile
- kernel/trace/ftrace.c 32 additions, 24 deletionskernel/trace/ftrace.c
- kernel/trace/ring_buffer.c 11 additions, 0 deletionskernel/trace/ring_buffer.c
- kernel/trace/trace.c 6 additions, 17 deletionskernel/trace/trace.c
- kernel/trace/trace.h 7 additions, 0 deletionskernel/trace/trace.h
- kernel/trace/trace_events.c 22 additions, 6 deletionskernel/trace/trace_events.c
- kernel/trace/trace_functions.c 1 addition, 2 deletionskernel/trace/trace_functions.c
- kernel/trace/trace_printk.c 6 additions, 20 deletionskernel/trace/trace_printk.c
- kernel/trace/trace_stat.c 1 addition, 5 deletionskernel/trace/trace_stat.c
Loading
Please register or sign in to comment