diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:47:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 07:47:45 -0400 |
| commit | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (patch) | |
| tree | 6c472ae9f709246ee5268e1d71559d07839fb965 /kernel/trace/trace_nop.c | |
| parent | 34886c8bc590f078d4c0b88f50d061326639198d (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: update to upstream tracing facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_nop.c')
| -rw-r--r-- | kernel/trace/trace_nop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_nop.c b/kernel/trace/trace_nop.c index 9aa84bde23cd..394f94417e2f 100644 --- a/kernel/trace/trace_nop.c +++ b/kernel/trace/trace_nop.c | |||
| @@ -91,6 +91,7 @@ struct tracer nop_trace __read_mostly = | |||
| 91 | .name = "nop", | 91 | .name = "nop", |
| 92 | .init = nop_trace_init, | 92 | .init = nop_trace_init, |
| 93 | .reset = nop_trace_reset, | 93 | .reset = nop_trace_reset, |
| 94 | .wait_pipe = poll_wait_pipe, | ||
| 94 | #ifdef CONFIG_FTRACE_SELFTEST | 95 | #ifdef CONFIG_FTRACE_SELFTEST |
| 95 | .selftest = trace_selftest_startup_nop, | 96 | .selftest = trace_selftest_startup_nop, |
| 96 | #endif | 97 | #endif |