Merge branch 'tracing-core-for-linus' of...
Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (40 commits) tracing: Separate raw syscall from syscall tracer ring-buffer-benchmark: Add parameters to set produce/consumer priorities tracing, function tracer: Clean up strstrip() usage ring-buffer benchmark: Run producer/consumer threads at nice +19 tracing: Remove the stale include/trace/power.h tracing: Only print objcopy version warning once from recordmcount tracing: Prevent build warning: 'ftrace_graph_buf' defined but not used ring-buffer: Move access to commit_page up into function used tracing: do not disable interrupts for trace_clock_local ring-buffer: Add multiple iterations between benchmark timestamps kprobes: Sanitize struct kretprobe_instance allocations tracing: Fix to use __always_unused attribute compiler: Introduce __always_unused tracing: Exit with error if a weak function is used in recordmcount.pl tracing: Move conditional into update_funcs() in recordmcount.pl tracing: Add regex for weak functions in recordmcount.pl tracing: Move mcount section search to front of loop in recordmcount.pl tracing: Fix objcopy revision check in recordmcount.pl tracing: Check absolute path of input file in recordmcount.pl tracing: Correct the check for number of arguments in recordmcount.pl ...
No related branches found
No related tags found
Showing
- Documentation/kernel-parameters.txt 7 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/trace/ftrace-design.txt 11 additions, 2 deletionsDocumentation/trace/ftrace-design.txt
- Makefile 1 addition, 0 deletionsMakefile
- arch/s390/kernel/ftrace.c 2 additions, 65 deletionsarch/s390/kernel/ftrace.c
- arch/x86/kernel/entry_32.S 2 additions, 5 deletionsarch/x86/kernel/entry_32.S
- arch/x86/kernel/entry_64.S 3 additions, 3 deletionsarch/x86/kernel/entry_64.S
- arch/x86/kernel/ftrace.c 7 additions, 77 deletionsarch/x86/kernel/ftrace.c
- arch/x86/mm/testmmiotrace.c 14 additions, 15 deletionsarch/x86/mm/testmmiotrace.c
- include/linux/compiler-gcc.h 1 addition, 0 deletionsinclude/linux/compiler-gcc.h
- include/linux/compiler.h 4 additions, 0 deletionsinclude/linux/compiler.h
- include/linux/smp_lock.h 17 additions, 4 deletionsinclude/linux/smp_lock.h
- include/trace/events/bkl.h 61 additions, 0 deletionsinclude/trace/events/bkl.h
- include/trace/events/syscalls.h 2 additions, 1 deletioninclude/trace/events/syscalls.h
- include/trace/power.h 0 additions, 32 deletionsinclude/trace/power.h
- include/trace/syscall.h 1 addition, 1 deletioninclude/trace/syscall.h
- kernel/kprobes.c 2 additions, 2 deletionskernel/kprobes.c
- kernel/trace/ftrace.c 236 additions, 139 deletionskernel/trace/ftrace.c
- kernel/trace/ring_buffer.c 3 additions, 6 deletionskernel/trace/ring_buffer.c
- kernel/trace/ring_buffer_benchmark.c 76 additions, 9 deletionskernel/trace/ring_buffer_benchmark.c
- kernel/trace/trace.c 2 additions, 2 deletionskernel/trace/trace.c
Loading
Please register or sign in to comment