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_boot.c | |
| parent | c91add5fa68ea9b1f2923b3788c5dae0e60e1f6b (diff) | |
| parent | 1c80025a49855b12fa09bb6db71820e3367b1369 (diff) | |
Merge branch 'tracing/ftrace' into tracing/function-return-tracer
Diffstat (limited to 'kernel/trace/trace_boot.c')
| -rw-r--r-- | kernel/trace/trace_boot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c index cb333b7fd11..a4fa2c57e34 100644 --- a/kernel/trace/trace_boot.c +++ b/kernel/trace/trace_boot.c @@ -47,7 +47,7 @@ static void reset_boot_trace(struct trace_array *tr) tracing_reset(tr, cpu); } -static void boot_trace_init(struct trace_array *tr) +static int boot_trace_init(struct trace_array *tr) { int cpu; boot_trace = tr; @@ -56,6 +56,7 @@ static void boot_trace_init(struct trace_array *tr) tracing_reset(tr, cpu); tracing_sched_switch_assign_trace(tr); + return 0; } static enum print_line_t |