diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 09:36:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 09:36:22 +0100 |
commit | 3f8e402f34ecc7d1d00b54703d3baa401b8bdd78 (patch) | |
tree | b1f515a1c5426809c076dd854f9385efb750683b /kernel/trace/ftrace.c | |
parent | tracing/branch-tracer: fix a trace recursion on branch tracer (diff) | |
parent | tracing/function-return-tracer: support for dynamic ftrace on function return... (diff) | |
parent | markers/tracpoints: fix non-modular build (diff) | |
parent | function tracing: fix wrong pos computing when read buffer has been fulfilled (diff) | |
download | linux-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