diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /kernel/trace/trace_functions.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_functions.c')
| -rw-r--r-- | kernel/trace/trace_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index e90eb0c2c56c..0f85a64003d3 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c | |||
| @@ -64,7 +64,7 @@ static void function_trace_ctrl_update(struct trace_array *tr) | |||
| 64 | 64 | ||
| 65 | static struct tracer function_trace __read_mostly = | 65 | static struct tracer function_trace __read_mostly = |
| 66 | { | 66 | { |
| 67 | .name = "ftrace", | 67 | .name = "function", |
| 68 | .init = function_trace_init, | 68 | .init = function_trace_init, |
| 69 | .reset = function_trace_reset, | 69 | .reset = function_trace_reset, |
| 70 | .ctrl_update = function_trace_ctrl_update, | 70 | .ctrl_update = function_trace_ctrl_update, |