summaryrefslogtreecommitdiffstats
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-17 09:36:22 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-17 09:36:22 +0100
commit3f8e402f34ecc7d1d00b54703d3baa401b8bdd78 (patch)
treeb1f515a1c5426809c076dd854f9385efb750683b /kernel/trace/ftrace.c
parenttracing/branch-tracer: fix a trace recursion on branch tracer (diff)
parenttracing/function-return-tracer: support for dynamic ftrace on function return... (diff)
parentmarkers/tracpoints: fix non-modular build (diff)
parentfunction tracing: fix wrong pos computing when read buffer has been fulfilled (diff)
downloadlinux-3f8e402f34ecc7d1d00b54703d3baa401b8bdd78.tar.xz
linux-3f8e402f34ecc7d1d00b54703d3baa401b8bdd78.zip
Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core