diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:57 -0400 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /kernel/trace/trace.c | |
| parent | 7be7923633a142402266d642ccebf74f556a649b (diff) | |
| parent | 018378c55b03f88ff513aba4e0e93b8d4a9cf241 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 644ab744e759..8683dec6946b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -4596,9 +4596,6 @@ __init static int tracer_alloc_buffers(void) | |||
| 4596 | 4596 | ||
| 4597 | register_tracer(&nop_trace); | 4597 | register_tracer(&nop_trace); |
| 4598 | current_trace = &nop_trace; | 4598 | current_trace = &nop_trace; |
| 4599 | #ifdef CONFIG_BOOT_TRACER | ||
| 4600 | register_tracer(&boot_tracer); | ||
| 4601 | #endif | ||
| 4602 | /* All seems OK, enable tracing */ | 4599 | /* All seems OK, enable tracing */ |
| 4603 | tracing_disabled = 0; | 4600 | tracing_disabled = 0; |
| 4604 | 4601 | ||