diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-06 01:43:47 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-06 01:43:47 -0500 |
| commit | 79c81d220c8e25163f56edcdfaf23f83a4c88e6b (patch) | |
| tree | 8748e39e968aacebbf150b81cbc845582b382a47 /kernel/trace/trace.c | |
| parent | 3299b4dd1180762da831be5eb6adc44553eaec26 (diff) | |
| parent | 79a9d461fd521f133f0e66485aa9ed09c21f5191 (diff) | |
Merge branch 'tracing/fastboot' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index d576dbd6defe..29ab40a764c8 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -3285,6 +3285,8 @@ __init static int tracer_alloc_buffers(void) | |||
| 3285 | 3285 | ||
| 3286 | register_tracer(&nop_trace); | 3286 | register_tracer(&nop_trace); |
| 3287 | #ifdef CONFIG_BOOT_TRACER | 3287 | #ifdef CONFIG_BOOT_TRACER |
| 3288 | /* We don't want to launch sched_switch tracer yet */ | ||
| 3289 | global_trace.ctrl = 0; | ||
| 3288 | register_tracer(&boot_tracer); | 3290 | register_tracer(&boot_tracer); |
| 3289 | current_trace = &boot_tracer; | 3291 | current_trace = &boot_tracer; |
| 3290 | current_trace->init(&global_trace); | 3292 | current_trace->init(&global_trace); |