diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-16 07:57:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-16 07:57:13 +0100 |
| commit | 985809608f758a8d3ddda4ce5a53ed0e57fb9e1b (patch) | |
| tree | 063fe72ed9bb3410c3293c83a7882cecc46e7410 /kernel/trace/trace_functions_return.c | |
| parent | c91add5fa68ea9b1f2923b3788c5dae0e60e1f6b (diff) | |
| parent | 1c80025a49855b12fa09bb6db71820e3367b1369 (diff) | |
Merge branch 'tracing/ftrace' into tracing/function-return-tracer
Diffstat (limited to 'kernel/trace/trace_functions_return.c')
| -rw-r--r-- | kernel/trace/trace_functions_return.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_return.c b/kernel/trace/trace_functions_return.c index 7680b21537d..61185f756a1 100644 --- a/kernel/trace/trace_functions_return.c +++ b/kernel/trace/trace_functions_return.c @@ -24,13 +24,14 @@ static void stop_return_trace(struct trace_array *tr) unregister_ftrace_return(); } -static void return_trace_init(struct trace_array *tr) +static int return_trace_init(struct trace_array *tr) { int cpu; for_each_online_cpu(cpu) tracing_reset(tr, cpu); start_return_trace(tr); + return 0; } static void return_trace_reset(struct trace_array *tr) |