Merge branch 'tracing-v28-for-linus' of...
Merge branch 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (131 commits) tracing/fastboot: improve help text tracing/stacktrace: improve help text tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix bootgraph.pl initcall name regexp tracing/fastboot: fix issues and improve output of bootgraph.pl tracepoints: synchronize unregister static inline tracepoints: tracepoint_synchronize_unregister() ftrace: make ftrace_test_p6nop disassembler-friendly markers: fix synchronize marker unregister static inline tracing/fastboot: add better resolution to initcall debug/tracing trace: add build-time check to avoid overrunning hex buffer ftrace: fix hex output mode of ftrace tracing/fastboot: fix initcalls disposition in bootgraph.pl tracing/fastboot: fix printk format typo in boot tracer ftrace: return an error when setting a nonexistent tracer ftrace: make some tracers reentrant ring-buffer: make reentrant ring-buffer: move page indexes into page headers tracing/fastboot: only trace non-module initcalls ftrace: move pc counter in irqtrace ... Manually fix conflicts: - init/main.c: initcall tracing - kernel/module.c: verbose level vs tracepoints - scripts/bootgraph.pl: fallout from cherry-picking commits.
Showing
- Documentation/markers.txt 6 additions, 4 deletionsDocumentation/markers.txt
- Documentation/tracepoints.txt 101 additions, 0 deletionsDocumentation/tracepoints.txt
- Documentation/tracers/mmiotrace.txt 2 additions, 3 deletionsDocumentation/tracers/mmiotrace.txt
- arch/powerpc/platforms/cell/spufs/sputrace.c 1 addition, 0 deletionsarch/powerpc/platforms/cell/spufs/sputrace.c
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/kernel/cpu/perfctr-watchdog.c 7 additions, 4 deletionsarch/x86/kernel/cpu/perfctr-watchdog.c
- arch/x86/kernel/entry_32.S 0 additions, 14 deletionsarch/x86/kernel/entry_32.S
- arch/x86/kernel/entry_64.S 0 additions, 26 deletionsarch/x86/kernel/entry_64.S
- arch/x86/kernel/ftrace.c 79 additions, 45 deletionsarch/x86/kernel/ftrace.c
- arch/x86/mm/mmio-mod.c 21 additions, 66 deletionsarch/x86/mm/mmio-mod.c
- arch/x86/mm/pf_in.c 84 additions, 37 deletionsarch/x86/mm/pf_in.c
- arch/x86/mm/testmmiotrace.c 4 additions, 0 deletionsarch/x86/mm/testmmiotrace.c
- include/asm-generic/vmlinux.lds.h 13 additions, 1 deletioninclude/asm-generic/vmlinux.lds.h
- include/asm-x86/ftrace.h 10 additions, 0 deletionsinclude/asm-x86/ftrace.h
- include/linux/compiler.h 2 additions, 0 deletionsinclude/linux/compiler.h
- include/linux/ftrace.h 78 additions, 6 deletionsinclude/linux/ftrace.h
- include/linux/init.h 1 addition, 1 deletioninclude/linux/init.h
- include/linux/kernel.h 5 additions, 0 deletionsinclude/linux/kernel.h
- include/linux/kprobes.h 3 additions, 2 deletionsinclude/linux/kprobes.h
- include/linux/linkage.h 0 additions, 2 deletionsinclude/linux/linkage.h
Loading
Please register or sign in to comment