diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-22 04:26:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-22 04:26:30 -0500 |
| commit | 03b30d151a918364c1c7d08bcb3e167be0a3746f (patch) | |
| tree | 0c728e624889c4fb32e028786c5db91bbdb5def1 /kernel/trace/trace.h | |
| parent | b43f70933e7753a284733d5ae355f6778bd118ce (diff) | |
| parent | 3690b5e6fd9daa030039ae9bda69044228bd476d (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 54b72781e920..b96037d970df 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -438,7 +438,6 @@ void trace_function(struct trace_array *tr, | |||
| 438 | 438 | ||
| 439 | void trace_graph_return(struct ftrace_graph_ret *trace); | 439 | void trace_graph_return(struct ftrace_graph_ret *trace); |
| 440 | int trace_graph_entry(struct ftrace_graph_ent *trace); | 440 | int trace_graph_entry(struct ftrace_graph_ent *trace); |
| 441 | void trace_hw_branch(struct trace_array *tr, u64 from, u64 to); | ||
| 442 | 441 | ||
| 443 | void tracing_start_cmdline_record(void); | 442 | void tracing_start_cmdline_record(void); |
| 444 | void tracing_stop_cmdline_record(void); | 443 | void tracing_stop_cmdline_record(void); |