diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-06 07:43:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-06 07:43:47 +0100 |
| commit | 79c81d220c8e25163f56edcdfaf23f83a4c88e6b (patch) | |
| tree | 8748e39e968aacebbf150b81cbc845582b382a47 /kernel/trace/trace.c | |
| parent | ftrace: sysctl typo (diff) | |
| parent | tracing/ftrace: fix a bug when switch current tracer to sched tracer (diff) | |
| download | linux-79c81d220c8e25163f56edcdfaf23f83a4c88e6b.tar.xz linux-79c81d220c8e25163f56edcdfaf23f83a4c88e6b.zip | |
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) register_tracer(&nop_trace); #ifdef CONFIG_BOOT_TRACER + /* We don't want to launch sched_switch tracer yet */ + global_trace.ctrl = 0; register_tracer(&boot_tracer); current_trace = &boot_tracer; current_trace->init(&global_trace); |