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: branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y branch tracer: Fix for enabling branch profiling makes sparse unusable ftrace: Correct a text align for event format output Update /debug/tracing/README tracing/ftrace: alloc the started cpumask for the trace file tracing, x86: remove duplicated #include ftrace: Add check of sched_stopped for probe_sched_wakeup function-graph: add proper initialization for init task tracing/ftrace: fix missing include string.h tracing: fix incorrect return type of ns2usecs() tracing: remove CALLER_ADDR2 from wakeup tracer blktrace: fix pdu_len when tracing packet command requests blktrace: small cleanup in blk_msg_write() blktrace: NUL-terminate user space messages tracing: move scripts/trace/power.pl to scripts/tracing/power.pl
Showing
- arch/x86/kernel/ftrace.c 0 additions, 1 deletionarch/x86/kernel/ftrace.c
- block/blk-core.c 1 addition, 0 deletionsblock/blk-core.c
- include/linux/compiler.h 2 additions, 1 deletioninclude/linux/compiler.h
- include/linux/ftrace.h 6 additions, 2 deletionsinclude/linux/ftrace.h
- include/linux/init_task.h 2 additions, 0 deletionsinclude/linux/init_task.h
- kernel/trace/blktrace.c 4 additions, 3 deletionskernel/trace/blktrace.c
- kernel/trace/trace.c 16 additions, 5 deletionskernel/trace/trace.c
- kernel/trace/trace.h 1 addition, 1 deletionkernel/trace/trace.h
- kernel/trace/trace_export.c 1 addition, 1 deletionkernel/trace/trace_export.c
- kernel/trace/trace_output.c 1 addition, 1 deletionkernel/trace/trace_output.c
- kernel/trace/trace_sched_switch.c 3 additions, 0 deletionskernel/trace/trace_sched_switch.c
- kernel/trace/trace_sched_wakeup.c 7 additions, 1 deletionkernel/trace/trace_sched_wakeup.c
- scripts/tracing/power.pl 0 additions, 0 deletionsscripts/tracing/power.pl
Loading
Please register or sign in to comment